OSDN Git Service

mmc: sdhci-acpi.c: Use SET_RUNTIME_PM_OPS macro to set runtime pm callbacks
authorPeter Griffin <peter.griffin@linaro.org>
Tue, 12 Aug 2014 16:14:29 +0000 (17:14 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 9 Sep 2014 11:59:06 +0000 (13:59 +0200)
This allows us to get rid of the #else condition, as the macro compiles
away to nothing if not enabled.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-acpi.c

index 8c53370..cc65b3f 100644 (file)
@@ -385,20 +385,13 @@ static int sdhci_acpi_runtime_idle(struct device *dev)
        return 0;
 }
 
-#else
-
-#define sdhci_acpi_runtime_suspend     NULL
-#define sdhci_acpi_runtime_resume      NULL
-#define sdhci_acpi_runtime_idle                NULL
-
 #endif
 
 static const struct dev_pm_ops sdhci_acpi_pm_ops = {
        .suspend                = sdhci_acpi_suspend,
        .resume                 = sdhci_acpi_resume,
-       .runtime_suspend        = sdhci_acpi_runtime_suspend,
-       .runtime_resume         = sdhci_acpi_runtime_resume,
-       .runtime_idle           = sdhci_acpi_runtime_idle,
+       SET_RUNTIME_PM_OPS(sdhci_acpi_runtime_suspend,
+                       sdhci_acpi_runtime_resume, sdhci_acpi_runtime_idle)
 };
 
 static struct platform_driver sdhci_acpi_driver = {