From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ulf Hansson Subject: Re: [PATCH RESEND 2/2] mmc: mxcmmc: Convert to SIMPLE_DEV_PM_OPS Date: Mon, 14 Apr 2014 14:37:38 +0200 Message-ID: References: <1395478366-6276-1-git-send-email-shc_work@mail.ru> <1395478366-6276-2-git-send-email-shc_work@mail.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from mail-qc0-f182.google.com ([209.85.216.182]:51222 "EHLO mail-qc0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948AbaDNMhj (ORCPT ); Mon, 14 Apr 2014 08:37:39 -0400 Received: by mail-qc0-f182.google.com with SMTP id e16so8569396qcx.41 for ; Mon, 14 Apr 2014 05:37:38 -0700 (PDT) In-Reply-To: <1395478366-6276-2-git-send-email-shc_work@mail.ru> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Alexander Shiyan Cc: linux-mmc , Chris Ball , Sascha Hauer , Anatolij Gustschin On 22 March 2014 09:52, Alexander Shiyan wrote: > Signed-off-by: Alexander Shiyan Acked-by: Ulf Hansson > --- > drivers/mmc/host/mxcmmc.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c > index 84d630e..86401c0 100644 > --- a/drivers/mmc/host/mxcmmc.c > +++ b/drivers/mmc/host/mxcmmc.c > @@ -1220,8 +1220,7 @@ static int mxcmci_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int mxcmci_suspend(struct device *dev) > +static int __maybe_unused mxcmci_suspend(struct device *dev) > { > struct mmc_host *mmc = dev_get_drvdata(dev); > struct mxcmci_host *host = mmc_priv(mmc); > @@ -1231,7 +1230,7 @@ static int mxcmci_suspend(struct device *dev) > 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 mxcmci_host *host = mmc_priv(mmc); > @@ -1241,11 +1240,7 @@ static int mxcmci_resume(struct device *dev) > return 0; > } > > -static const struct dev_pm_ops mxcmci_pm_ops = { > - .suspend = mxcmci_suspend, > - .resume = mxcmci_resume, > -}; > -#endif > +static SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume); > > static struct platform_driver mxcmci_driver = { > .probe = mxcmci_probe, > @@ -1254,9 +1249,7 @@ static struct platform_driver mxcmci_driver = { > .driver = { > .name = DRIVER_NAME, > .owner = THIS_MODULE, > -#ifdef CONFIG_PM > .pm = &mxcmci_pm_ops, > -#endif > .of_match_table = mxcmci_of_match, > } > }; > -- > 1.8.3.2 >