Skip to content

Commit d604af8

Browse files
Alain Volmatjhedberg
authored andcommitted
drivers: memc: stm32_xspi_psram: use XSPI_HandleTypeDef ptr at init
Avoid copying the whole XSPI_HandleTypeDef structure into the init function and use a pointer since the structure is already part of the _data structure. Signed-off-by: Alain Volmat <[email protected]>
1 parent 45e0baf commit d604af8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

drivers/memc/memc_stm32_xspi_psram.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ static int memc_stm32_xspi_psram_init(const struct device *dev)
215215
{
216216
const struct memc_stm32_xspi_psram_config *dev_cfg = dev->config;
217217
struct memc_stm32_xspi_psram_data *dev_data = dev->data;
218-
XSPI_HandleTypeDef hxspi = dev_data->hxspi;
218+
XSPI_HandleTypeDef *hxspi = &dev_data->hxspi;
219219
uint32_t ahb_clock_freq;
220220
XSPIM_CfgTypeDef cfg = {0};
221221
XSPI_RegularCmdTypeDef cmd = {0};
@@ -287,24 +287,24 @@ static int memc_stm32_xspi_psram_init(const struct device *dev)
287287
return -EINVAL;
288288
}
289289

290-
hxspi.Init.ClockPrescaler = prescaler;
291-
hxspi.Init.MemorySize = find_msb_set(dev_cfg->memory_size) - 2;
290+
hxspi->Init.ClockPrescaler = prescaler;
291+
hxspi->Init.MemorySize = find_msb_set(dev_cfg->memory_size) - 2;
292292

293-
if (HAL_XSPI_Init(&hxspi) != HAL_OK) {
293+
if (HAL_XSPI_Init(hxspi) != HAL_OK) {
294294
LOG_ERR("XSPI Init failed");
295295
return -EIO;
296296
}
297297

298298
cfg.nCSOverride = HAL_XSPI_CSSEL_OVR_NCS1;
299299
cfg.IOPort = HAL_XSPIM_IOPORT_1;
300300

301-
if (HAL_XSPIM_Config(&hxspi, &cfg, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
301+
if (HAL_XSPIM_Config(hxspi, &cfg, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
302302
LOG_ERR("XSPIMgr Init failed");
303303
return -EIO;
304304
}
305305

306306
/* Configure AP memory registers */
307-
ret = ap_memory_configure(&hxspi);
307+
ret = ap_memory_configure(hxspi);
308308
if (ret != 0) {
309309
LOG_ERR("AP memory configuration failed");
310310
return -EIO;
@@ -329,15 +329,15 @@ static int memc_stm32_xspi_psram_init(const struct device *dev)
329329
cmd.DummyCycles = DUMMY_CLK_CYCLES_WRITE;
330330
cmd.DQSMode = HAL_XSPI_DQS_ENABLE;
331331

332-
if (HAL_XSPI_Command(&hxspi, &cmd, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
332+
if (HAL_XSPI_Command(hxspi, &cmd, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
333333
return -EIO;
334334
}
335335

336336
cmd.OperationType = HAL_XSPI_OPTYPE_READ_CFG;
337337
cmd.Instruction = BURST_READ_CMD;
338338
cmd.DummyCycles = DUMMY_CLK_CYCLES_READ;
339339

340-
if (HAL_XSPI_Command(&hxspi, &cmd, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
340+
if (HAL_XSPI_Command(hxspi, &cmd, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
341341
return -EIO;
342342
}
343343

@@ -350,12 +350,12 @@ static int memc_stm32_xspi_psram_init(const struct device *dev)
350350
mem_mapped_cfg.NoPrefetchAXI = HAL_XSPI_AXI_PREFETCH_DISABLE;
351351
#endif
352352

353-
if (HAL_XSPI_MemoryMapped(&hxspi, &mem_mapped_cfg) != HAL_OK) {
353+
if (HAL_XSPI_MemoryMapped(hxspi, &mem_mapped_cfg) != HAL_OK) {
354354
return -EIO;
355355
}
356356

357357
#if defined(XSPI_CR_NOPREF)
358-
stm32_reg_modify_bits(&hxspi.Instance->CR, XSPI_CR_NOPREF,
358+
stm32_reg_modify_bits(&hxspi->Instance->CR, XSPI_CR_NOPREF,
359359
HAL_XSPI_AUTOMATIC_PREFETCH_DISABLE);
360360
#endif
361361

0 commit comments

Comments
 (0)