mmc: sdhci-pxav3: Remove non needed #ifdef CONFIG_PM for dev_pm_ops

As the SET_SYSTEM_SLEEP_PM_OPS and the SET_RUNTIME_PM_OPS macro deals with
the CONFIG_PM options when assigning the callbacks, it becomes redundant
to control this when declaring the struct dev_pm_ops. Instead let's always
declare it as it simplifies the code.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 30132500aa1c83aec0c501354d7b9fb4c1fae1a7..dd1938d341f7ae2af1de80bfa4f39678b865441d 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -583,24 +583,17 @@ static int sdhci_pxav3_runtime_resume(struct device *dev)
 }
 #endif
 
-#ifdef CONFIG_PM
 static const struct dev_pm_ops sdhci_pxav3_pmops = {
        SET_SYSTEM_SLEEP_PM_OPS(sdhci_pxav3_suspend, sdhci_pxav3_resume)
        SET_RUNTIME_PM_OPS(sdhci_pxav3_runtime_suspend,
                sdhci_pxav3_runtime_resume, NULL)
 };
 
-#define SDHCI_PXAV3_PMOPS (&sdhci_pxav3_pmops)
-
-#else
-#define SDHCI_PXAV3_PMOPS NULL
-#endif
-
 static struct platform_driver sdhci_pxav3_driver = {
        .driver         = {
                .name   = "sdhci-pxav3",
                .of_match_table = of_match_ptr(sdhci_pxav3_of_match),
-               .pm     = SDHCI_PXAV3_PMOPS,
+               .pm     = &sdhci_pxav3_pmops,
        },
        .probe          = sdhci_pxav3_probe,
        .remove         = sdhci_pxav3_remove,