diff for duplicates of <1483544119.9552.223.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index e98fa42..e55ac18 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,17 +2,17 @@ On Wed, 2017-01-04 at 15:55 +0100, Arnd Bergmann wrote: > On Friday, December 23, 2016 9:40:51 PM CET Zhangfei Gao wrote: > > @@ -176,6 +177,14 @@ static int dw_i2c_plat_probe(struct > > platform_device *pdev) -> > dev->irq = irq; -> > platform_set_drvdata(pdev, dev); -> > -> > + dev->rst = devm_reset_control_get_optional_exclusive(&pdev- +> > ????????dev->irq = irq; +> > ????????platform_set_drvdata(pdev, dev); +> > ? +> > +???????dev->rst = devm_reset_control_get_optional_exclusive(&pdev- > > >dev, NULL); -> > + if (IS_ERR(dev->rst)) { -> > + if (PTR_ERR(dev->rst) == -EPROBE_DEFER) -> > + return -EPROBE_DEFER; -> > + } else { -> > + reset_control_deassert(dev->rst); -> > + } +> > +???????if (IS_ERR(dev->rst)) { +> > +???????????????if (PTR_ERR(dev->rst) == -EPROBE_DEFER) +> > +???????????????????????return -EPROBE_DEFER; +> > +???????} else { +> > +???????????????reset_control_deassert(dev->rst); +> > +???????} > > + > > Sorry for the late reply, I only now stumbled over this. I think it's @@ -28,23 +28,23 @@ control. > > > @@ -270,10 +280,18 @@ static int dw_i2c_plat_probe(struct > > platform_device *pdev) -> > } -> > -> > r = i2c_dw_probe(dev); -> > - if (r && !dev->pm_runtime_disabled) -> > - pm_runtime_disable(&pdev->dev); -> > + if (r) -> > + goto exit_probe; -> > -> > return r; +> > ????????} +> > ? +> > ????????r = i2c_dw_probe(dev); +> > -???????if (r && !dev->pm_runtime_disabled) +> > -???????????????pm_runtime_disable(&pdev->dev); +> > +???????if (r) +> > +???????????????goto exit_probe; +> > ? +> > ????????return r; > > + > > +exit_probe: -> > + if (!dev->pm_runtime_disabled) -> > + pm_runtime_disable(&pdev->dev); +> > +???????if (!dev->pm_runtime_disabled) +> > +???????????????pm_runtime_disable(&pdev->dev); > > +exit_reset: -> > + if (!IS_ERR_OR_NULL(dev->rst)) -> > + reset_control_assert(dev->rst); -> > + return r; +> > +???????if (!IS_ERR_OR_NULL(dev->rst)) +> > +???????????????reset_control_assert(dev->rst); +> > +???????return r; > > > > try to avoid the IS_ERR_OR_NULL() check, it usually indicates either diff --git a/a/content_digest b/N1/content_digest index d8bfae7..33f737a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,33 +1,26 @@ "ref\01482500451-30137-1-git-send-email-zhangfei.gao@linaro.org\0" "ref\02921529.fKUMSWjgsl@wuerfel\0" - "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" - "Subject\0Re: [PATCH v3] i2c: designware: add reset interface\0" + "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" + "Subject\0[PATCH v3] i2c: designware: add reset interface\0" "Date\0Wed, 04 Jan 2017 17:35:19 +0200\0" - "To\0Arnd Bergmann <arnd@arndb.de>" - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0Zhangfei Gao <zhangfei.gao@linaro.org>" - Wolfram Sang <wsa@the-dreams.de> - mika.westerberg@linux.intel.com - jarkko.nikula@linux.intel.com - p.zabel@pengutronix.de - " linux-i2c@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 2017-01-04 at 15:55 +0100, Arnd Bergmann wrote:\n" "> On Friday, December 23, 2016 9:40:51 PM CET Zhangfei Gao wrote:\n" "> > @@ -176,6 +177,14 @@ static int dw_i2c_plat_probe(struct\n" "> > platform_device *pdev)\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240dev->irq = irq;\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240platform_set_drvdata(pdev, dev);\n" - "> > \302\240\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240dev->rst = devm_reset_control_get_optional_exclusive(&pdev-\n" + "> > ????????dev->irq = irq;\n" + "> > ????????platform_set_drvdata(pdev, dev);\n" + "> > ?\n" + "> > +???????dev->rst = devm_reset_control_get_optional_exclusive(&pdev-\n" "> > >dev, NULL);\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (IS_ERR(dev->rst)) {\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (PTR_ERR(dev->rst) == -EPROBE_DEFER)\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return -EPROBE_DEFER;\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240} else {\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240reset_control_deassert(dev->rst);\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240}\n" + "> > +???????if (IS_ERR(dev->rst)) {\n" + "> > +???????????????if (PTR_ERR(dev->rst) == -EPROBE_DEFER)\n" + "> > +???????????????????????return -EPROBE_DEFER;\n" + "> > +???????} else {\n" + "> > +???????????????reset_control_deassert(dev->rst);\n" + "> > +???????}\n" "> > +\n" "> \n" "> Sorry for the late reply, I only now stumbled over this. I think it's\n" @@ -43,23 +36,23 @@ "> \n" "> > @@ -270,10 +280,18 @@ static int dw_i2c_plat_probe(struct\n" "> > platform_device *pdev)\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240}\n" - "> > \302\240\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240r = i2c_dw_probe(dev);\n" - "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (r && !dev->pm_runtime_disabled)\n" - "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240pm_runtime_disable(&pdev->dev);\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (r)\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240goto exit_probe;\n" - "> > \302\240\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return r;\n" + "> > ????????}\n" + "> > ?\n" + "> > ????????r = i2c_dw_probe(dev);\n" + "> > -???????if (r && !dev->pm_runtime_disabled)\n" + "> > -???????????????pm_runtime_disable(&pdev->dev);\n" + "> > +???????if (r)\n" + "> > +???????????????goto exit_probe;\n" + "> > ?\n" + "> > ????????return r;\n" "> > +\n" "> > +exit_probe:\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!dev->pm_runtime_disabled)\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240pm_runtime_disable(&pdev->dev);\n" + "> > +???????if (!dev->pm_runtime_disabled)\n" + "> > +???????????????pm_runtime_disable(&pdev->dev);\n" "> > +exit_reset:\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!IS_ERR_OR_NULL(dev->rst))\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240reset_control_assert(dev->rst);\n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240return r;\n" + "> > +???????if (!IS_ERR_OR_NULL(dev->rst))\n" + "> > +???????????????reset_control_assert(dev->rst);\n" + "> > +???????return r;\n" "> > \n" "> \n" "> try to avoid the IS_ERR_OR_NULL() check, it usually indicates either\n" @@ -82,4 +75,4 @@ "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -2e9421a7111541eaec8651ac0f2370e7c0ca2b9c56beb6d3a1f571fbc8a7eccf +5fe46981e88043ea2b6ac8be0008ba8259186b1e57d97daddff673199ffd35c5
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.