mmc: atmel-mci: add CONFIG_PM_SLEEP to suspend/resume functions
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 08:56:16 +0000 (17:56 +0900)
committerChris Ball <cjb@laptop.org>
Sun, 26 May 2013 18:23:21 +0000 (14:23 -0400)
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]

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/atmel-mci.c

index aca59d9..7d8e87a 100644 (file)
@@ -2504,7 +2504,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);
@@ -2559,17 +2559,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),
        },
 };