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

mmc: mxc: Use the new PM macros 



Use DEFINE_SIMPLE_DEV_PM_OPS() instead of the SIMPLE_DEV_PM_OPS()
macro, along with using pm_sleep_ptr() as this driver doesn't handle
runtime PM.

This makes it possible to remove the #ifdef CONFIG_PM guard around
the suspend/resume functions.

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 e0d64ecc

drivers/mmc/host/mxcmmc.c

+2 −4
Original line number Diff line number Diff line
@@ -1183,7 +1183,6 @@ static int mxcmci_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int mxcmci_suspend(struct device *dev)

{

	struct mmc_host *mmc = dev_get_drvdata(dev);
@@ -1210,9 +1209,8 @@ static int mxcmci_resume(struct device *dev) 


	return ret;

}

#endif



static SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);

DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);



static struct platform_driver mxcmci_driver = {

	.probe		= mxcmci_probe,
@@ -1220,7 +1218,7 @@ static struct platform_driver mxcmci_driver = { 
	.driver		= {

		.name		= DRIVER_NAME,

		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,

		.pm	= &mxcmci_pm_ops,

		.pm	= pm_sleep_ptr(&mxcmci_pm_ops),

		.of_match_table	= mxcmci_of_match,

	}

};