diff options
| author |   Ulf Hansson <ulf.hansson@linaro.org> | 2016-07-27 10:39:52 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-07-27 10:43:05 +0200 |
| commit | dafed447eb6cce4bfb2aef649ed98e5718d6b751 (patch) | |
| tree | 7f20cd075040b5e9389083f8721575b654390782 /drivers/mmc | |
| parent | mmc: sdhci-pci-core: Simplify code by using SET_SYSTEM_SLEEP_PM_OPS (diff) | |
| download | linux-dev-dafed447eb6cce4bfb2aef649ed98e5718d6b751.tar.xz linux-dev-dafed447eb6cce4bfb2aef649ed98e5718d6b751.zip | |
mmc: sdhci-acpi: Simplify code by using SET_SYSTEM_SLEEP_PM_OPS
By using the SET_SYSTEM_SLEEP_PM_OPS when assigning the system PM
callbacks, we can remove some #ifdefs so code becomes a bit cleaner.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-acpi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index 458ffb7637e5..5bf4bcf2e59a 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -531,11 +531,6 @@ static int sdhci_acpi_resume(struct device *dev) return sdhci_resume_host(c->host); } -#else - -#define sdhci_acpi_suspend NULL -#define sdhci_acpi_resume NULL - #endif #ifdef CONFIG_PM @@ -559,8 +554,7 @@ static int sdhci_acpi_runtime_resume(struct device *dev) #endif static const struct dev_pm_ops sdhci_acpi_pm_ops = { - .suspend = sdhci_acpi_suspend, - .resume = sdhci_acpi_resume, + SET_SYSTEM_SLEEP_PM_OPS(sdhci_acpi_suspend, sdhci_acpi_resume) SET_RUNTIME_PM_OPS(sdhci_acpi_runtime_suspend, sdhci_acpi_runtime_resume, NULL) }; |