Patchwork [1/3] mtd: r852: add CONFIG_PM_SLEEP to suspend/resume functions

login
register
mail settings
Submitter Jingoo Han
Date March 26, 2013, 6:53 a.m.
Message ID <000f01ce29ee$90692c10$b13b8430$%han@samsung.com>
Download mbox | patch
Permalink /patch/231095/
State Accepted
Commit b87c92c1ad6c29c4068a6d64483903a89ec2bce1
Headers show

Comments

Jingoo Han - March 26, 2013, 6:53 a.m.
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 NULL defines are
removed.

drivers/mtd/nand/r852.c:1006:12: warning: 'r852_suspend' defined but not used [-Wunused-function]
drivers/mtd/nand/r852.c:1027:12: warning: 'r852_resume' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/mtd/nand/r852.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Artem Bityutskiy - May 10, 2013, 12:59 p.m.
On Tue, 2013-03-26 at 15:53 +0900, Jingoo Han wrote:
> 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 NULL defines are
> removed.

Pushed these 3 to l2-mtd.git, thanks!

Patch

diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 4495f85..ef72884 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -1002,7 +1002,7 @@  void r852_shutdown(struct pci_dev *pci_dev)
 	pci_disable_device(pci_dev);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int r852_suspend(struct device *device)
 {
 	struct r852_device *dev = pci_get_drvdata(to_pci_dev(device));
@@ -1055,9 +1055,6 @@  static int r852_resume(struct device *device)
 	r852_update_card_detect(dev);
 	return 0;
 }
-#else
-#define r852_suspend	NULL
-#define r852_resume	NULL
 #endif
 
 static const struct pci_device_id r852_pci_id_tbl[] = {