Skip to contentSkip to conversation

mmc: atmel-mci: add CONFIG_PM_SLEEP to suspend/resume functions

PATCH In review Jingoo Han 2 participants 2 messages Apr 29, 2013 – May 26, 2013

Subsystems (3)
MMC, SD and SDIO Arm/Microchip (AT91) SoC support Microchip MMC/SD/SDIO mci driver
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH v2 1/1 mmc: atmel-mci: 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.

drivers/mmc/host/atmel-mci.c:2509:12: warning: 'atmci_suspend' defined but not used [-Wunused-function] drivers/mmc/host/atmel-mci.c:2539:12: warning: 'atmci_resume' defined but not used [-Wunused-function]

Acked-by Ludovic Desroches <[email protected]>
Signed-off-by Jingoo Han <[email protected]>

---
Changes since v1:
- added Ludovic Desroches's Acked-by
- re-based on the latest branch

 drivers/mmc/host/atmel-mci.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
drivers/mmc/host/atmel-mci.c +4 -6
index e75774f..645fe9a 100644
@@ -2505,7 +2505,7 @@ static int __exit atmci_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int atmci_suspend(struct device *dev)
 {
 	struct atmel_mci *host = dev_get_drvdata(dev);

@@ -2560,17 +2560,15 @@ static int atmci_resume(struct device *dev)
 
 	return ret;
 }
-static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume);
-#define ATMCI_PM_OPS	(&atmci_pm)
-#else
-#define ATMCI_PM_OPS	NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume);
+
 static struct platform_driver atmci_driver = {
 	.remove		= __exit_p(atmci_remove),
 	.driver		= {
 		.name		= "atmel_mci",
-		.pm		= ATMCI_PM_OPS,
+		.pm		= &atmci_pm,
 		.of_match_table	= of_match_ptr(atmci_dt_ids),
 	},
 };
Signature · 1 line
1.7.2.5
#1 lore raw

Hi,

Quoted 10 lines · Jingoo Han

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.

drivers/mmc/host/atmel-mci.c:2509:12: warning: 'atmci_suspend' defined but not used [-Wunused-function] drivers/mmc/host/atmel-mci.c:2539:12: warning: 'atmci_resume' defined but not used [-Wunused-function]

Acked-by Ludovic Desroches <[email protected]>
Signed-off-by Jingoo Han <[email protected]>

Thanks, pushed to mmc-next for 3.11.

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child