p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Ulf Hansson 2016-07-27 11:23:37 +02:00
parent a81ce7723e
commit 6b3a194b7c
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/sdhci-s3c.c
View File

@ -714,19 +714,12 @@ static int sdhci_s3c_runtime_resume(struct device *dev)
} }
#endif #endif
#ifdef CONFIG_PM
static const struct dev_pm_ops sdhci_s3c_pmops = { static const struct dev_pm_ops sdhci_s3c_pmops = {
SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume) SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume)
SET_RUNTIME_PM_OPS(sdhci_s3c_runtime_suspend, sdhci_s3c_runtime_resume, SET_RUNTIME_PM_OPS(sdhci_s3c_runtime_suspend, sdhci_s3c_runtime_resume,
NULL) NULL)
}; };
#define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops)
#else
#define SDHCI_S3C_PMOPS NULL
#endif
#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) #if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212)
static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = { static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
.no_divider = true, .no_divider = true,
@ -765,7 +758,7 @@ static struct platform_driver sdhci_s3c_driver = {
.driver = { .driver = {
.name = "s3c-sdhci", .name = "s3c-sdhci",
.of_match_table = of_match_ptr(sdhci_s3c_dt_match), .of_match_table = of_match_ptr(sdhci_s3c_dt_match),
.pm = SDHCI_S3C_PMOPS, .pm = &sdhci_s3c_pmops,
}, },
}; };