evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: mxcmmc: Convert to SIMPLE_DEV_PM_OPS

Browse source 
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
This commit is contained in:
Alexander Shiyan 2014-03-22 12:52:46 +04:00 • committed by Chris Ball
parent 01e4f95853
commit 384a81d585
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/mmc/host/mxcmmc.c
View file

@ -1220,8 +1220,7 @@ static int mxcmci_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM static int __maybe_unused mxcmci_suspend(struct device *dev)
static int mxcmci_suspend(struct device *dev)
{ {
struct mmc_host *mmc = dev_get_drvdata(dev); struct mmc_host *mmc = dev_get_drvdata(dev);
struct mxcmci_host *host = mmc_priv(mmc); struct mxcmci_host *host = mmc_priv(mmc);
@ -1231,7 +1230,7 @@ static int mxcmci_suspend(struct device *dev)
return 0; return 0;
} }
static int mxcmci_resume(struct device *dev) static int __maybe_unused mxcmci_resume(struct device *dev)
{ {
struct mmc_host *mmc = dev_get_drvdata(dev); struct mmc_host *mmc = dev_get_drvdata(dev);
struct mxcmci_host *host = mmc_priv(mmc); struct mxcmci_host *host = mmc_priv(mmc);
@ -1241,11 +1240,7 @@ static int mxcmci_resume(struct device *dev)
return 0; return 0;
} }
static const struct dev_pm_ops mxcmci_pm_ops = { static SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);
.suspend = mxcmci_suspend,
.resume = mxcmci_resume,
};
#endif
static struct platform_driver mxcmci_driver = { static struct platform_driver mxcmci_driver = {
.probe = mxcmci_probe, .probe = mxcmci_probe,
@ -1254,9 +1249,7 @@ static struct platform_driver mxcmci_driver = {
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &mxcmci_pm_ops, .pm = &mxcmci_pm_ops,
#endif
.of_match_table = mxcmci_of_match, .of_match_table = mxcmci_of_match,
} }
}; };