Commit 33575b25 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Boris Brezillon

mtd: nand: fsmc: remove CONFIG_OF conditional

Since commit 4404d7d8 ("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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 77cc88d2
...@@ -1083,20 +1083,18 @@ static int fsmc_nand_resume(struct device *dev) ...@@ -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); 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[] = { static const struct of_device_id fsmc_nand_id_table[] = {
{ .compatible = "st,spear600-fsmc-nand" }, { .compatible = "st,spear600-fsmc-nand" },
{ .compatible = "stericsson,fsmc-nand" }, { .compatible = "stericsson,fsmc-nand" },
{} {}
}; };
MODULE_DEVICE_TABLE(of, fsmc_nand_id_table); MODULE_DEVICE_TABLE(of, fsmc_nand_id_table);
#endif
static struct platform_driver fsmc_nand_driver = { static struct platform_driver fsmc_nand_driver = {
.remove = fsmc_nand_remove, .remove = fsmc_nand_remove,
.driver = { .driver = {
.name = "fsmc-nand", .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, .pm = &fsmc_nand_pm_ops,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment