Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: sdhci-s3c: 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>

+1 -8
+1 -8
drivers/mmc/host/sdhci-s3c.c
··· 714 714 } 715 715 #endif 716 716 717 - #ifdef CONFIG_PM 718 717 static const struct dev_pm_ops sdhci_s3c_pmops = { 719 718 SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume) 720 719 SET_RUNTIME_PM_OPS(sdhci_s3c_runtime_suspend, sdhci_s3c_runtime_resume, 721 720 NULL) 722 721 }; 723 - 724 - #define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops) 725 - 726 - #else 727 - #define SDHCI_S3C_PMOPS NULL 728 - #endif 729 722 730 723 #if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) 731 724 static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = { ··· 758 765 .driver = { 759 766 .name = "s3c-sdhci", 760 767 .of_match_table = of_match_ptr(sdhci_s3c_dt_match), 761 - .pm = SDHCI_S3C_PMOPS, 768 + .pm = &sdhci_s3c_pmops, 762 769 }, 763 770 }; 764 771