diff for duplicates of <20160122073258.GB10350@IND12F0122> diff --git a/a/1.txt b/N1/1.txt index b0e1f27..79f84b3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,40 +11,35 @@ On Thu, Jan 21, 2016 at 11:21:53AM -0800, Matt Ranostay wrote: > > drivers/staging/iio/adc/spear_adc.c | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > -> > diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/= -adc/spear_adc.c +> > diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c > > index 712cae0..4ac0f54 100644 > > --- a/drivers/staging/iio/adc/spear_adc.c > > +++ b/drivers/staging/iio/adc/spear_adc.c -> > @@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *= -pdev) -> > st->adc_base_spear3xx =3D -> > (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6= -xx; +> > @@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *pdev) +> > st->adc_base_spear3xx = +> > (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx; > > -> > - st->clk =3D clk_get(dev, NULL); -> > + st->clk =3D devm_clk_get(dev, NULL); +> > - st->clk = clk_get(dev, NULL); +> > + st->clk = devm_clk_get(dev, NULL); > > if (IS_ERR(st->clk)) { > > dev_err(dev, "failed getting clock\n"); > > goto errout1; -> > @@ -297,7 +297,7 @@ static int spear_adc_probe(struct platform_device *= -pdev) -> > ret =3D clk_prepare_enable(st->clk); +> > @@ -297,7 +297,7 @@ static int spear_adc_probe(struct platform_device *pdev) +> > ret = clk_prepare_enable(st->clk); > > if (ret) { > > dev_err(dev, "failed enabling clock\n"); > > - goto errout2; > > + goto errout1; > > } > > -> > irq =3D platform_get_irq(pdev, 0); -> > @@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *= -pdev) +> > irq = platform_get_irq(pdev, 0); +> > @@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *pdev) > > > > errout3: > > clk_disable_unprepare(st->clk); ->=20 +> > Shouldn't errout3 now be errout2.. having a gap would seem odd. ->=20 +> I agree with you on this. But as Dan says,I would correct it in a different patch. > > -errout2: @@ -53,4 +48,4 @@ different patch. > > iounmap(st->adc_base_spear6xx); > > return ret; > > -- -> > 1.9.1= +> > 1.9.1 diff --git a/a/content_digest b/N1/content_digest index 6937cdf..fef2fd9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -30,40 +30,35 @@ "> > drivers/staging/iio/adc/spear_adc.c | 6 ++----\n" "> > 1 file changed, 2 insertions(+), 4 deletions(-)\n" "> >\n" - "> > diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/=\n" - "adc/spear_adc.c\n" + "> > diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c\n" "> > index 712cae0..4ac0f54 100644\n" "> > --- a/drivers/staging/iio/adc/spear_adc.c\n" "> > +++ b/drivers/staging/iio/adc/spear_adc.c\n" - "> > @@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *=\n" - "pdev)\n" - "> > st->adc_base_spear3xx =3D\n" - "> > (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6=\n" - "xx;\n" + "> > @@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *pdev)\n" + "> > st->adc_base_spear3xx =\n" + "> > (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;\n" "> >\n" - "> > - st->clk =3D clk_get(dev, NULL);\n" - "> > + st->clk =3D devm_clk_get(dev, NULL);\n" + "> > - st->clk = clk_get(dev, NULL);\n" + "> > + st->clk = devm_clk_get(dev, NULL);\n" "> > if (IS_ERR(st->clk)) {\n" "> > dev_err(dev, \"failed getting clock\\n\");\n" "> > goto errout1;\n" - "> > @@ -297,7 +297,7 @@ static int spear_adc_probe(struct platform_device *=\n" - "pdev)\n" - "> > ret =3D clk_prepare_enable(st->clk);\n" + "> > @@ -297,7 +297,7 @@ static int spear_adc_probe(struct platform_device *pdev)\n" + "> > ret = clk_prepare_enable(st->clk);\n" "> > if (ret) {\n" "> > dev_err(dev, \"failed enabling clock\\n\");\n" "> > - goto errout2;\n" "> > + goto errout1;\n" "> > }\n" "> >\n" - "> > irq =3D platform_get_irq(pdev, 0);\n" - "> > @@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *=\n" - "pdev)\n" + "> > irq = platform_get_irq(pdev, 0);\n" + "> > @@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *pdev)\n" "> >\n" "> > errout3:\n" "> > clk_disable_unprepare(st->clk);\n" - ">=20\n" + "> \n" "> Shouldn't errout3 now be errout2.. having a gap would seem odd.\n" - ">=20\n" + "> \n" "I agree with you on this. But as Dan says,I would correct it in a\n" "different patch.\n" "> > -errout2:\n" @@ -72,6 +67,6 @@ "> > iounmap(st->adc_base_spear6xx);\n" "> > return ret;\n" "> > --\n" - > > 1.9.1= + > > 1.9.1 -f1633d319a575db3bd0e581e625029f5cd3f9105cc297a39cc9696bb308321ac +aa807f4df43a8dbd8dbf03bc647ad544d5ba8047bd0c864d7d49ae34e2a4cb09
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.