Commit e0d64ecc authored by Paul Cercueil's avatar Paul Cercueil Committed by Rafael J. Wysocki
Browse files

mmc: jz4740: Use the new PM macros 



 - Use DEFINE_SIMPLE_DEV_PM_OPS() instead of the SIMPLE_DEV_PM_OPS()
   macro. This makes it possible to remove the __maybe_unused flags
   on the callback functions.

 - Since we only have callbacks for suspend/resume, we can conditionally
   compile the dev_pm_ops structure for when CONFIG_PM_SLEEP is enabled;
   so use the pm_sleep_ptr() macro instead of pm_ptr().

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d1579e61

drivers/mmc/host/jz4740_mmc.c

+4 −4
Original line number Diff line number Diff line
@@ -1103,17 +1103,17 @@ static int jz4740_mmc_remove(struct platform_device *pdev) 
	return 0;

}



static int __maybe_unused jz4740_mmc_suspend(struct device *dev)

static int jz4740_mmc_suspend(struct device *dev)

{

	return pinctrl_pm_select_sleep_state(dev);

}



static int __maybe_unused jz4740_mmc_resume(struct device *dev)

static int jz4740_mmc_resume(struct device *dev)

{

	return pinctrl_select_default_state(dev);

}



static SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,

DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,

	jz4740_mmc_resume);



static struct platform_driver jz4740_mmc_driver = {
@@ -1123,7 +1123,7 @@ static struct platform_driver jz4740_mmc_driver = { 
		.name = "jz4740-mmc",

		.probe_type = PROBE_PREFER_ASYNCHRONOUS,

		.of_match_table = of_match_ptr(jz4740_mmc_of_match),

		.pm = pm_ptr(&jz4740_mmc_pm_ops),

		.pm = pm_sleep_ptr(&jz4740_mmc_pm_ops),

	},

};