LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: spi: Use CONFIG_IS_ENABLED to prevent ifdef 

Use CONFIG_IS_ENABLED to prevent ifdef in sf_probe.c

Cc: Simon Glass <sjg@chromium.org>
Cc: Vignesh R <vigneshr@ti.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Jagan Teki 2020-05-13 00:11:27 +05:30
parent 84673b4550
commit 3ee152b965
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mtd/spi/sf_internal.h
View File

@ -82,5 +82,15 @@ int spi_flash_cmd_get_sw_write_prot(struct spi_flash *flash);
#if CONFIG_IS_ENABLED(SPI_FLASH_MTD) #if CONFIG_IS_ENABLED(SPI_FLASH_MTD)
int spi_flash_mtd_register(struct spi_flash *flash); int spi_flash_mtd_register(struct spi_flash *flash);
void spi_flash_mtd_unregister(void); void spi_flash_mtd_unregister(void);
#else
static inline int spi_flash_mtd_register(struct spi_flash *flash)
{
return 0;
}
static inline void spi_flash_mtd_unregister(void)
{
}
#endif #endif
#endif /* _SF_INTERNAL_H_ */ #endif /* _SF_INTERNAL_H_ */

11
drivers/mtd/spi/sf_probe.c
View File

@ -45,9 +45,8 @@ static int spi_flash_probe_slave(struct spi_flash *flash)
if (ret) if (ret)
goto err_read_id; goto err_read_id;
#if CONFIG_IS_ENABLED(SPI_FLASH_MTD) if (CONFIG_IS_ENABLED(SPI_FLASH_MTD))
ret = spi_flash_mtd_register(flash); ret = spi_flash_mtd_register(flash);
#endif
err_read_id: err_read_id:
spi_release_bus(spi); spi_release_bus(spi);
@ -84,9 +83,9 @@ struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs,
void spi_flash_free(struct spi_flash *flash) void spi_flash_free(struct spi_flash *flash)
{ {
#if CONFIG_IS_ENABLED(SPI_FLASH_MTD) if (CONFIG_IS_ENABLED(SPI_FLASH_MTD))
spi_flash_mtd_unregister(); spi_flash_mtd_unregister();
#endif
spi_free_slave(flash->spi); spi_free_slave(flash->spi);
free(flash); free(flash);
} }
@ -153,9 +152,9 @@ int spi_flash_std_probe(struct udevice *dev)
static int spi_flash_std_remove(struct udevice *dev) static int spi_flash_std_remove(struct udevice *dev)
{ {
#if CONFIG_IS_ENABLED(SPI_FLASH_MTD) if (CONFIG_IS_ENABLED(SPI_FLASH_MTD))
spi_flash_mtd_unregister(); spi_flash_mtd_unregister();
#endif
return 0; return 0;
} }