diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-09-10 10:55:47 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-16 09:55:18 +0200 |
| commit | aa577bfc6d3ac3a07d489fadc733036edef70c0c (patch) | |
| tree | 370e382fa0e55c452893c91563f6240b339fd9ab | |
| parent | 68bc34d416ceffaa11be0ac096e87ffdfb482081 (diff) | |
| download | barebox-aa577bfc6d3ac3a07d489fadc733036edef70c0c.tar.gz barebox-aa577bfc6d3ac3a07d489fadc733036edef70c0c.tar.xz | |
drivers/nor/cfi_flash: use IS_ENABLED instead of an ifdef
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/nor/cfi_flash.c | 8 | ||||
| -rw-r--r-- | drivers/nor/cfi_flash.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c index 16885c0af9..d9347b237d 100644 --- a/drivers/nor/cfi_flash.c +++ b/drivers/nor/cfi_flash.c @@ -917,7 +917,6 @@ struct file_operations cfi_ops = { .memmap = generic_memmap_ro, }; -#ifdef CONFIG_PARTITION_NEED_MTD static int cfi_mtd_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { @@ -977,7 +976,6 @@ static void cfi_init_mtd(struct flash_info *info) mtd->flags = MTD_CAP_NORFLASH; info->cdev.mtd = mtd; } -#endif static int cfi_probe (struct device_d *dev) { @@ -1006,9 +1004,9 @@ static int cfi_probe (struct device_d *dev) info->cdev.ops = &cfi_ops; info->cdev.priv = info; -#ifdef CONFIG_PARTITION_NEED_MTD - cfi_init_mtd(info); -#endif + if (IS_ENABLED(CONFIG_PARTITION_NEED_MTD)) + cfi_init_mtd(info); + devfs_create(&info->cdev); return 0; diff --git a/drivers/nor/cfi_flash.h b/drivers/nor/cfi_flash.h index fec08940ab..1bfe81c381 100644 --- a/drivers/nor/cfi_flash.h +++ b/drivers/nor/cfi_flash.h @@ -75,9 +75,7 @@ struct flash_info { ulong addr_unlock2; /* unlock address 2 for AMD flash roms */ struct cfi_cmd_set *cfi_cmd_set; struct cdev cdev; -#ifdef CONFIG_PARTITION_NEED_MTD struct mtd_info mtd; -#endif int numeraseregions; struct mtd_erase_region_info *eraseregions; void *base; |