Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b330999 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: sdhci-pltfm: Convert to use the SET_SYSTEM_SLEEP_PM_OPS 



Move the system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid
them being build when not used. This also allows us to use the
SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.

Within this context it also makes sense to move the declaration of the
struct sdhci_pltfm_pmops, outside the #ifdef CONFIG_PM as the
SET_SYSTEM_SLEEP_PM_OPS deals with this. This further simplifies the code.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 21b8fe0f

drivers/mmc/host/sdhci-pltfm.c

+3 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int sdhci_pltfm_unregister(struct platform_device *pdev) 
}

EXPORT_SYMBOL_GPL(sdhci_pltfm_unregister);



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int sdhci_pltfm_suspend(struct device *dev)

{

	struct sdhci_host *host = dev_get_drvdata(dev);
@@ -229,13 +229,12 @@ static int sdhci_pltfm_resume(struct device *dev) 


	return sdhci_resume_host(host);

}

#endif



const struct dev_pm_ops sdhci_pltfm_pmops = {

	.suspend	= sdhci_pltfm_suspend,

	.resume		= sdhci_pltfm_resume,

	SET_SYSTEM_SLEEP_PM_OPS(sdhci_pltfm_suspend, sdhci_pltfm_resume)

};

EXPORT_SYMBOL_GPL(sdhci_pltfm_pmops);

#endif	/* CONFIG_PM */



static int __init sdhci_pltfm_drv_init(void)

{

drivers/mmc/host/sdhci-pltfm.h

+0 −4
Original line number Diff line number Diff line
@@ -109,11 +109,7 @@ static inline void *sdhci_pltfm_priv(struct sdhci_pltfm_host *host) 
	return (void *)host->private;

}



#ifdef CONFIG_PM

extern const struct dev_pm_ops sdhci_pltfm_pmops;

#define SDHCI_PLTFM_PMOPS (&sdhci_pltfm_pmops)

#else

#define SDHCI_PLTFM_PMOPS NULL

#endif



#endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */