From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonyoung Shim Subject: Re: [PATCH Resend 1/3] mmc: sdhci-s3c: Use mmc_gpio_request_cd function Date: Tue, 10 Dec 2013 17:43:13 +0900 Message-ID: <52A6D421.5070806@samsung.com> References: <52A6CB57.3080602@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mailout1.samsung.com ([203.254.224.24]:18719 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752485Ab3LJIn1 (ORCPT ); Tue, 10 Dec 2013 03:43:27 -0500 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXL00MXV1K0R380@mailout1.samsung.com> for linux-mmc@vger.kernel.org; Tue, 10 Dec 2013 17:43:13 +0900 (KST) In-reply-to: <52A6CB57.3080602@samsung.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Beomho Seo Cc: Chris Ball , linux-mmc@vger.kernel.org, =?ISO-8859-1?Q?Heiko_St=FCbner?= , Myungjoo Ham , Jaehoon Chung Hi, On 12/10/2013 05:05 PM, Beomho Seo wrote: > Hi all, > > Didn't have any other comment for this patch? > If don't have any other comment, I want this patch set is submitted at mmc-next. > I have tested this patch set on exynos4 board. > > CC'd Heiko Above comments are not suitable for changelog. Please move after the "---" marker line. > > This patch use mmc_gpio_request_cd function. > > Signed-off-by: Beomho Seo > Signed-off-by: Jaehoon Chung > --- > drivers/mmc/host/sdhci-s3c.c | 56 +++++++++++------------------------------- > 1 file changed, 14 insertions(+), 42 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c > index 6debda9..180371a 100644 > --- a/drivers/mmc/host/sdhci-s3c.c > +++ b/drivers/mmc/host/sdhci-s3c.c > @@ -27,6 +27,7 @@ > #include > > #include > +#include > > #include "sdhci-s3c-regs.h" > #include "sdhci.h" > @@ -400,44 +401,6 @@ static void sdhci_s3c_notify_change(struct platform_device *dev, int state) > } > } > > -static irqreturn_t sdhci_s3c_gpio_card_detect_thread(int irq, void *dev_id) > -{ > - struct sdhci_s3c *sc = dev_id; > - int status = gpio_get_value(sc->ext_cd_gpio); > - if (sc->pdata->ext_cd_gpio_invert) > - status = !status; > - sdhci_s3c_notify_change(sc->pdev, status); > - return IRQ_HANDLED; > -} > - > -static void sdhci_s3c_setup_card_detect_gpio(struct sdhci_s3c *sc) > -{ > - struct s3c_sdhci_platdata *pdata = sc->pdata; > - struct device *dev = &sc->pdev->dev; > - > - if (devm_gpio_request(dev, pdata->ext_cd_gpio, "SDHCI EXT CD") == 0) { > - sc->ext_cd_gpio = pdata->ext_cd_gpio; > - sc->ext_cd_irq = gpio_to_irq(pdata->ext_cd_gpio); > - if (sc->ext_cd_irq && > - request_threaded_irq(sc->ext_cd_irq, NULL, > - sdhci_s3c_gpio_card_detect_thread, > - IRQF_TRIGGER_RISING | > - IRQF_TRIGGER_FALLING | > - IRQF_ONESHOT, > - dev_name(dev), sc) == 0) { > - int status = gpio_get_value(sc->ext_cd_gpio); > - if (pdata->ext_cd_gpio_invert) > - status = !status; > - sdhci_s3c_notify_change(sc->pdev, status); > - } else { > - dev_warn(dev, "cannot request irq for card detect\n"); > - sc->ext_cd_irq = 0; > - } > - } else { > - dev_err(dev, "cannot request gpio for card detect\n"); > - } > -} > - > #ifdef CONFIG_OF > static int sdhci_s3c_parse_dt(struct device *dev, > struct sdhci_host *host, struct s3c_sdhci_platdata *pdata) > @@ -699,8 +662,14 @@ static int sdhci_s3c_probe(struct platform_device *pdev) > if (pdata->cd_type == S3C_SDHCI_CD_EXTERNAL && pdata->ext_cd_init) > pdata->ext_cd_init(&sdhci_s3c_notify_change); > if (pdata->cd_type == S3C_SDHCI_CD_GPIO && > - gpio_is_valid(pdata->ext_cd_gpio)) > - sdhci_s3c_setup_card_detect_gpio(sc); > + gpio_is_valid(pdata->ext_cd_gpio)) { > + ret = mmc_gpio_request_cd(host->mmc, pdata->ext_cd_gpio, 0); > + if (ret) { > + dev_err(dev, > + "failed to reqeust card detect gpio\n"); > + goto err_req_cd; > + } > + } > > #ifdef CONFIG_PM_RUNTIME > if (pdata->cd_type != S3C_SDHCI_CD_INTERNAL) > @@ -708,6 +677,9 @@ static int sdhci_s3c_probe(struct platform_device *pdev) > #endif > return 0; > > + err_req_cd: > + mmc_gpio_free_cd(host->mmc); It's wrong to go here when mmc_gpio_request_cd() is failed. > + > err_req_regs: > #ifndef CONFIG_PM_RUNTIME > clk_disable_unprepare(sc->clk_bus[sc->cur_clk]); > @@ -731,8 +703,8 @@ static int sdhci_s3c_remove(struct platform_device *pdev) > if (pdata->cd_type == S3C_SDHCI_CD_EXTERNAL && pdata->ext_cd_cleanup) > pdata->ext_cd_cleanup(&sdhci_s3c_notify_change); > > - if (sc->ext_cd_irq) > - free_irq(sc->ext_cd_irq, sc); > + if (pdata->ext_cd_gpio) > + mmc_gpio_free_cd(host->mmc); > > #ifdef CONFIG_PM_RUNTIME > if (pdata->cd_type != S3C_SDHCI_CD_INTERNAL) > -- 1.7.9.5 Thanks.