Commit 80ce4dde authored by Jingoo Han's avatar Jingoo Han Committed by David Woodhouse

mtd: fsmc_nand: add CONFIG_PM_SLEEP to suspend/resume functions

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
build warning when CONFIG_PM_SLEEP is not selected. This is because
sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
the CONFIG_PM_SLEEP is enabled. Also, unnecessary CONFIG_PM ifdefs
are removed.

drivers/mtd/nand/fsmc_nand.c:1194:12: warning: 'fsmc_nand_suspend' defined but not used [-Wunused-function]
drivers/mtd/nand/fsmc_nand.c:1202:12: warning: 'fsmc_nand_resume' defined but not used [-Wunused-function]
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b87c92c1
...@@ -1190,7 +1190,7 @@ static int fsmc_nand_remove(struct platform_device *pdev) ...@@ -1190,7 +1190,7 @@ static int fsmc_nand_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int fsmc_nand_suspend(struct device *dev) static int fsmc_nand_suspend(struct device *dev)
{ {
struct fsmc_nand_data *host = dev_get_drvdata(dev); struct fsmc_nand_data *host = dev_get_drvdata(dev);
...@@ -1210,9 +1210,9 @@ static int fsmc_nand_resume(struct device *dev) ...@@ -1210,9 +1210,9 @@ static int fsmc_nand_resume(struct device *dev)
} }
return 0; return 0;
} }
#endif
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);
#endif
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id fsmc_nand_id_table[] = { static const struct of_device_id fsmc_nand_id_table[] = {
...@@ -1229,9 +1229,7 @@ static struct platform_driver fsmc_nand_driver = { ...@@ -1229,9 +1229,7 @@ static struct platform_driver fsmc_nand_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "fsmc-nand", .name = "fsmc-nand",
.of_match_table = of_match_ptr(fsmc_nand_id_table), .of_match_table = of_match_ptr(fsmc_nand_id_table),
#ifdef CONFIG_PM
.pm = &fsmc_nand_pm_ops, .pm = &fsmc_nand_pm_ops,
#endif
}, },
}; };
......
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