From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755320AbbKYJPH (ORCPT ); Wed, 25 Nov 2015 04:15:07 -0500 Received: from mailgw01.mediatek.com ([218.249.47.110]:43353 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752821AbbKYJO7 (ORCPT ); Wed, 25 Nov 2015 04:14:59 -0500 X-Listener-Flag: 11101 Message-ID: <1448442890.27169.5.camel@mhfsdcap03> Subject: Re: [PATCH v2] spi: mediatek: revise mtk_spi_probe() failure flow From: lei liu To: Matthias Brugger CC: Mark Brown , Mark Rutland , Sascha Hauer , , , , , Date: Wed, 25 Nov 2015 17:14:50 +0800 In-Reply-To: <5654A89A.3090202@gmail.com> References: <1448332712-29039-1-git-send-email-leilk.liu@mediatek.com> <5654A89A.3090202@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2015-11-24 at 19:12 +0100, Matthias Brugger wrote: > > On 24/11/15 03:38, Leilk Liu wrote: > > This patch revises failure flow while pm_runtime_enable(). > > Please write a proper commit message explaining what this patch does. > OK, thanks! > > > > Signed-off-by: Leilk Liu > > --- > > drivers/spi/spi-mt65xx.c | 15 ++++++++------- > > 1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c > > index 6c1a96e..00a36da 100644 > > --- a/drivers/spi/spi-mt65xx.c > > +++ b/drivers/spi/spi-mt65xx.c > > @@ -607,7 +607,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk); > > if (ret < 0) { > > dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret); > > - goto err_disable_clk; > > + clk_disable_unprepare(mdata->spi_clk); > > + goto err_put_master; > > } > > > > clk_disable_unprepare(mdata->spi_clk); > > @@ -617,7 +618,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > > ret = devm_spi_register_master(&pdev->dev, master); > > if (ret) { > > dev_err(&pdev->dev, "failed to register master (%d)\n", ret); > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (mdata->dev_comp->need_pad_sel) { > > @@ -626,14 +627,14 @@ static int mtk_spi_probe(struct platform_device *pdev) > > "pad_num does not match num_chipselect(%d != %d)\n", > > mdata->pad_num, master->num_chipselect); > > ret = -EINVAL; > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (!master->cs_gpios && master->num_chipselect > 1) { > > dev_err(&pdev->dev, > > "cs_gpios not specified and num_chipselect > 1\n"); > > ret = -EINVAL; > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (master->cs_gpios) { > > @@ -644,7 +645,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > > if (ret) { > > dev_err(&pdev->dev, > > "can't get CS GPIO %i\n", i); > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > } > > } > > @@ -652,8 +653,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > > > return 0; > > > > -err_disable_clk: > > - clk_disable_unprepare(mdata->spi_clk); > > +err_disable_runtime_pm: > > + pm_runtime_disable(&pdev->dev); > > err_put_master: > > spi_master_put(master); > > > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: lei liu Subject: Re: [PATCH v2] spi: mediatek: revise mtk_spi_probe() failure flow Date: Wed, 25 Nov 2015 17:14:50 +0800 Message-ID: <1448442890.27169.5.camel@mhfsdcap03> References: <1448332712-29039-1-git-send-email-leilk.liu@mediatek.com> <5654A89A.3090202@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <5654A89A.3090202-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Matthias Brugger Cc: Mark Brown , Mark Rutland , Sascha Hauer , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: devicetree@vger.kernel.org On Tue, 2015-11-24 at 19:12 +0100, Matthias Brugger wrote: > > On 24/11/15 03:38, Leilk Liu wrote: > > This patch revises failure flow while pm_runtime_enable(). > > Please write a proper commit message explaining what this patch does. > OK, thanks! > > > > Signed-off-by: Leilk Liu > > --- > > drivers/spi/spi-mt65xx.c | 15 ++++++++------- > > 1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c > > index 6c1a96e..00a36da 100644 > > --- a/drivers/spi/spi-mt65xx.c > > +++ b/drivers/spi/spi-mt65xx.c > > @@ -607,7 +607,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk); > > if (ret < 0) { > > dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret); > > - goto err_disable_clk; > > + clk_disable_unprepare(mdata->spi_clk); > > + goto err_put_master; > > } > > > > clk_disable_unprepare(mdata->spi_clk); > > @@ -617,7 +618,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > > ret = devm_spi_register_master(&pdev->dev, master); > > if (ret) { > > dev_err(&pdev->dev, "failed to register master (%d)\n", ret); > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (mdata->dev_comp->need_pad_sel) { > > @@ -626,14 +627,14 @@ static int mtk_spi_probe(struct platform_device *pdev) > > "pad_num does not match num_chipselect(%d != %d)\n", > > mdata->pad_num, master->num_chipselect); > > ret = -EINVAL; > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (!master->cs_gpios && master->num_chipselect > 1) { > > dev_err(&pdev->dev, > > "cs_gpios not specified and num_chipselect > 1\n"); > > ret = -EINVAL; > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (master->cs_gpios) { > > @@ -644,7 +645,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > > if (ret) { > > dev_err(&pdev->dev, > > "can't get CS GPIO %i\n", i); > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > } > > } > > @@ -652,8 +653,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > > > return 0; > > > > -err_disable_clk: > > - clk_disable_unprepare(mdata->spi_clk); > > +err_disable_runtime_pm: > > + pm_runtime_disable(&pdev->dev); > > err_put_master: > > spi_master_put(master); > > > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: lei liu Subject: Re: [PATCH v2] spi: mediatek: revise mtk_spi_probe() failure flow Date: Wed, 25 Nov 2015 17:14:50 +0800 Message-ID: <1448442890.27169.5.camel@mhfsdcap03> References: <1448332712-29039-1-git-send-email-leilk.liu@mediatek.com> <5654A89A.3090202@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: Mark Brown , Mark Rutland , Sascha Hauer , , , , , To: Matthias Brugger Return-path: In-Reply-To: <5654A89A.3090202-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-spi.vger.kernel.org On Tue, 2015-11-24 at 19:12 +0100, Matthias Brugger wrote: > > On 24/11/15 03:38, Leilk Liu wrote: > > This patch revises failure flow while pm_runtime_enable(). > > Please write a proper commit message explaining what this patch does. > OK, thanks! > > > > Signed-off-by: Leilk Liu > > --- > > drivers/spi/spi-mt65xx.c | 15 ++++++++------- > > 1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c > > index 6c1a96e..00a36da 100644 > > --- a/drivers/spi/spi-mt65xx.c > > +++ b/drivers/spi/spi-mt65xx.c > > @@ -607,7 +607,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk); > > if (ret < 0) { > > dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret); > > - goto err_disable_clk; > > + clk_disable_unprepare(mdata->spi_clk); > > + goto err_put_master; > > } > > > > clk_disable_unprepare(mdata->spi_clk); > > @@ -617,7 +618,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > > ret = devm_spi_register_master(&pdev->dev, master); > > if (ret) { > > dev_err(&pdev->dev, "failed to register master (%d)\n", ret); > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (mdata->dev_comp->need_pad_sel) { > > @@ -626,14 +627,14 @@ static int mtk_spi_probe(struct platform_device *pdev) > > "pad_num does not match num_chipselect(%d != %d)\n", > > mdata->pad_num, master->num_chipselect); > > ret = -EINVAL; > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (!master->cs_gpios && master->num_chipselect > 1) { > > dev_err(&pdev->dev, > > "cs_gpios not specified and num_chipselect > 1\n"); > > ret = -EINVAL; > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (master->cs_gpios) { > > @@ -644,7 +645,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > > if (ret) { > > dev_err(&pdev->dev, > > "can't get CS GPIO %i\n", i); > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > } > > } > > @@ -652,8 +653,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > > > return 0; > > > > -err_disable_clk: > > - clk_disable_unprepare(mdata->spi_clk); > > +err_disable_runtime_pm: > > + pm_runtime_disable(&pdev->dev); > > err_put_master: > > spi_master_put(master); > > > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: leilk.liu@mediatek.com (lei liu) Date: Wed, 25 Nov 2015 17:14:50 +0800 Subject: [PATCH v2] spi: mediatek: revise mtk_spi_probe() failure flow In-Reply-To: <5654A89A.3090202@gmail.com> References: <1448332712-29039-1-git-send-email-leilk.liu@mediatek.com> <5654A89A.3090202@gmail.com> Message-ID: <1448442890.27169.5.camel@mhfsdcap03> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, 2015-11-24 at 19:12 +0100, Matthias Brugger wrote: > > On 24/11/15 03:38, Leilk Liu wrote: > > This patch revises failure flow while pm_runtime_enable(). > > Please write a proper commit message explaining what this patch does. > OK, thanks! > > > > Signed-off-by: Leilk Liu > > --- > > drivers/spi/spi-mt65xx.c | 15 ++++++++------- > > 1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c > > index 6c1a96e..00a36da 100644 > > --- a/drivers/spi/spi-mt65xx.c > > +++ b/drivers/spi/spi-mt65xx.c > > @@ -607,7 +607,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk); > > if (ret < 0) { > > dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret); > > - goto err_disable_clk; > > + clk_disable_unprepare(mdata->spi_clk); > > + goto err_put_master; > > } > > > > clk_disable_unprepare(mdata->spi_clk); > > @@ -617,7 +618,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > > ret = devm_spi_register_master(&pdev->dev, master); > > if (ret) { > > dev_err(&pdev->dev, "failed to register master (%d)\n", ret); > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (mdata->dev_comp->need_pad_sel) { > > @@ -626,14 +627,14 @@ static int mtk_spi_probe(struct platform_device *pdev) > > "pad_num does not match num_chipselect(%d != %d)\n", > > mdata->pad_num, master->num_chipselect); > > ret = -EINVAL; > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (!master->cs_gpios && master->num_chipselect > 1) { > > dev_err(&pdev->dev, > > "cs_gpios not specified and num_chipselect > 1\n"); > > ret = -EINVAL; > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > > > if (master->cs_gpios) { > > @@ -644,7 +645,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > > if (ret) { > > dev_err(&pdev->dev, > > "can't get CS GPIO %i\n", i); > > - goto err_put_master; > > + goto err_disable_runtime_pm; > > } > > } > > } > > @@ -652,8 +653,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > > > return 0; > > > > -err_disable_clk: > > - clk_disable_unprepare(mdata->spi_clk); > > +err_disable_runtime_pm: > > + pm_runtime_disable(&pdev->dev); > > err_put_master: > > spi_master_put(master); > > > >