mtd: nand: fsmc: remove CONFIG_OF conditional

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=33575b25fff26085c17675b5b63d60e889cfe959
Commit:     33575b25fff26085c17675b5b63d60e889cfe959
Parent:     77cc88d2b9848bac16c32c01eebf45f060f81f45
Author:     Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
AuthorDate: Tue Mar 21 11:04:05 2017 +0100
Committer:  Boris Brezillon <boris.brezillon at free-electrons.com>
CommitDate: Thu Mar 23 11:11:44 2017 +0100

    mtd: nand: fsmc: remove CONFIG_OF conditional
    
    Since commit 4404d7d821c33 ("mtd: nand: fsmc: remove stale non-DT probe
    path"), the fsmc NAND driver only supports Device Tree probing, and
    therefore has a "depends on OF" in its Kconfig option.
    
    Due to this the #ifdef CONFIG_OF ... #endif condition in the driver code
    is no longer necessary.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
    Reviewed-by: Linus Walleij <linus.walleij at linaro.org>
    Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
---
 drivers/mtd/nand/fsmc_nand.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index e35cabb..cea50d2 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -1083,20 +1083,18 @@ static int fsmc_nand_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(fsmc_nand_pm_ops, fsmc_nand_suspend, fsmc_nand_resume);
 
-#ifdef CONFIG_OF
 static const struct of_device_id fsmc_nand_id_table[] = {
 	{ .compatible = "st,spear600-fsmc-nand" },
 	{ .compatible = "stericsson,fsmc-nand" },
 	{}
 };
 MODULE_DEVICE_TABLE(of, fsmc_nand_id_table);
-#endif
 
 static struct platform_driver fsmc_nand_driver = {
 	.remove = fsmc_nand_remove,
 	.driver = {
 		.name = "fsmc-nand",
-		.of_match_table = of_match_ptr(fsmc_nand_id_table),
+		.of_match_table = fsmc_nand_id_table,
 		.pm = &fsmc_nand_pm_ops,
 	},
 };