From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sascha Hauer Subject: Re: [PATCH 16/27] mmc: mxcmmc: Move away from using deprecated APIs Date: Fri, 27 Sep 2013 09:19:37 +0200 Message-ID: <20130927071937.GJ30088@pengutronix.de> References: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> <1380207292-16968-17-git-send-email-ulf.hansson@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1380207292-16968-17-git-send-email-ulf.hansson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org To: Ulf Hansson Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball , Anatolij Gustschin List-Id: linux-mmc@vger.kernel.org On Thu, Sep 26, 2013 at 04:54:41PM +0200, Ulf Hansson wrote: > Suspend and resume of cards are being handled from the protocol layer > and consequently the mmc_suspend|resume_host APIs are deprecated. > > This means we can simplify the suspend|resume callbacks by removing the > use of the deprecated APIs. > > Cc: Sascha Hauer > Cc: Anatolij Gustschin > Signed-off-by: Ulf Hansson Acked-by: Sascha Hauer Sascha > --- > drivers/mmc/host/mxcmmc.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c > index c174c6a..f7199c8 100644 > --- a/drivers/mmc/host/mxcmmc.c > +++ b/drivers/mmc/host/mxcmmc.c > @@ -1250,28 +1250,20 @@ static int mxcmci_suspend(struct device *dev) > { > struct mmc_host *mmc = dev_get_drvdata(dev); > struct mxcmci_host *host = mmc_priv(mmc); > - int ret = 0; > > - if (mmc) > - ret = mmc_suspend_host(mmc); > clk_disable_unprepare(host->clk_per); > clk_disable_unprepare(host->clk_ipg); > - > - return ret; > + return 0; > } > > static int mxcmci_resume(struct device *dev) > { > struct mmc_host *mmc = dev_get_drvdata(dev); > struct mxcmci_host *host = mmc_priv(mmc); > - int ret = 0; > > clk_prepare_enable(host->clk_per); > clk_prepare_enable(host->clk_ipg); > - if (mmc) > - ret = mmc_resume_host(mmc); > - > - return ret; > + return 0; > } > > static const struct dev_pm_ops mxcmci_pm_ops = { > -- > 1.7.9.5 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |