Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1273689 > unrolled thread
| Started by | Leilk Liu <leilk.liu@mediatek.com> |
|---|---|
| First post | 2015-11-20 03:30 +0100 |
| Last post | 2015-11-25 10:20 +0100 |
| Articles | 5 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 4/4] spi: mediatek: revise mtk_spi_probe() failure flow Leilk Liu <leilk.liu@mediatek.com> - 2015-11-20 03:30 +0100
Re: [PATCH 4/4] spi: mediatek: revise mtk_spi_probe() failure flow Mark Brown <broonie@kernel.org> - 2015-11-21 14:50 +0100
Re: [PATCH 4/4] spi: mediatek: revise mtk_spi_probe() failure flow lei liu <leilk.liu@mediatek.com> - 2015-11-24 03:40 +0100
Re: [PATCH 4/4] spi: mediatek: revise mtk_spi_probe() failure flow Mark Brown <broonie@kernel.org> - 2015-11-24 14:10 +0100
Re: [PATCH 4/4] spi: mediatek: revise mtk_spi_probe() failure flow lei liu <leilk.liu@mediatek.com> - 2015-11-25 10:20 +0100
| From | Leilk Liu <leilk.liu@mediatek.com> |
|---|---|
| Date | 2015-11-20 03:30 +0100 |
| Subject | [PATCH 4/4] spi: mediatek: revise mtk_spi_probe() failure flow |
| Message-ID | <qwJCx-10e-5@gated-at.bofh.it> |
This patch revises failure flow while pm_runtime_enable().
Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
---
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);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Date | 2015-11-21 14:50 +0100 |
| Message-ID | <qxgIa-5XE-15@gated-at.bofh.it> |
| In reply to | #1273689 |
[Multipart message — attachments visible in raw view] — view raw
On Fri, Nov 20, 2015 at 10:21:19AM +0800, Leilk Liu wrote:
> This patch revises failure flow while pm_runtime_enable().
Why? This also doesn't apply against current code, please check and
resend.
>
> Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
> ---
> 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);
>
> --
> 1.7.9.5
>
>
[toc] | [prev] | [next] | [standalone]
| From | lei liu <leilk.liu@mediatek.com> |
|---|---|
| Date | 2015-11-24 03:40 +0100 |
| Message-ID | <qybGq-1Y4-23@gated-at.bofh.it> |
| In reply to | #1274659 |
On Sat, 2015-11-21 at 13:39 +0000, Mark Brown wrote:
> On Fri, Nov 20, 2015 at 10:21:19AM +0800, Leilk Liu wrote:
> > This patch revises failure flow while pm_runtime_enable().
>
> Why? This also doesn't apply against current code, please check and
> resend.
I don't know. I can git am this patch to spi/for-next. I will resend it,
please help to apply it again, thanks.
> >
> > Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
> > ---
> > 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);
> >
> > --
> > 1.7.9.5
> >
> >
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Date | 2015-11-24 14:10 +0100 |
| Message-ID | <qylw6-5A-15@gated-at.bofh.it> |
| In reply to | #1276027 |
[Multipart message — attachments visible in raw view] — view raw
On Tue, Nov 24, 2015 at 10:33:24AM +0800, lei liu wrote: > On Sat, 2015-11-21 at 13:39 +0000, Mark Brown wrote: > > On Fri, Nov 20, 2015 at 10:21:19AM +0800, Leilk Liu wrote: > > > This patch revises failure flow while pm_runtime_enable(). > > Why? This also doesn't apply against current code, please check and > > resend. > I don't know. I can git am this patch to spi/for-next. I will resend it, > please help to apply it again, thanks. If you don't know why we should make this change then we may as well just not make it?
[toc] | [prev] | [next] | [standalone]
| From | lei liu <leilk.liu@mediatek.com> |
|---|---|
| Date | 2015-11-25 10:20 +0100 |
| Message-ID | <qyEp4-4c9-27@gated-at.bofh.it> |
| In reply to | #1276416 |
On Tue, 2015-11-24 at 13:04 +0000, Mark Brown wrote: > On Tue, Nov 24, 2015 at 10:33:24AM +0800, lei liu wrote: > > On Sat, 2015-11-21 at 13:39 +0000, Mark Brown wrote: > > > On Fri, Nov 20, 2015 at 10:21:19AM +0800, Leilk Liu wrote: > > > > > This patch revises failure flow while pm_runtime_enable(). > > > > Why? This also doesn't apply against current code, please check and > > > resend. > > > I don't know. I can git am this patch to spi/for-next. I will resend it, > > please help to apply it again, thanks. > > If you don't know why we should make this change then we may as well > just not make it? OK. I will write a proper commit message to explain what this patch does. Thanks. > _________________ > ______________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web