[PATCH v2] mtd: nand: gpio: Remove unneeded CONFIG_OF
Ezequiel Garcia
ezequiel.garcia at free-electrons.com
Sat Dec 7 10:36:49 EST 2013
Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe
to remove the #ifdef CONFIG_OF. Also remove the of_match_ptr guard as
it's no longer required. Build tested only.
Cc: Alexander Shiyan <shc_work at mail.ru>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
---
drivers/mtd/nand/gpio.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index e826f89..c966f86 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -94,7 +94,6 @@ static int gpio_nand_devready(struct mtd_info *mtd)
return gpio_get_value(gpiomtd->plat.gpio_rdy);
}
-#ifdef CONFIG_OF
static const struct of_device_id gpio_nand_id_table[] = {
{ .compatible = "gpio-control-nand" },
{}
@@ -145,19 +144,6 @@ static struct resource *gpio_nand_get_io_sync_of(struct platform_device *pdev)
return r;
}
-#else /* CONFIG_OF */
-static inline int gpio_nand_get_config_of(const struct device *dev,
- struct gpio_nand_platdata *plat)
-{
- return -ENOSYS;
-}
-
-static inline struct resource *
-gpio_nand_get_io_sync_of(struct platform_device *pdev)
-{
- return NULL;
-}
-#endif /* CONFIG_OF */
static inline int gpio_nand_get_config(const struct device *dev,
struct gpio_nand_platdata *plat)
@@ -308,7 +294,7 @@ static struct platform_driver gpio_nand_driver = {
.driver = {
.name = "gpio-nand",
.owner = THIS_MODULE,
- .of_match_table = of_match_ptr(gpio_nand_id_table),
+ .of_match_table = gpio_nand_id_table,
},
};
--
1.8.1.5
More information about the linux-mtd
mailing list