[PATCH] staging: iio: replace clk_get() with devm_clk_get()

[PATCH] staging: iio: replace clk_get() with devm_clk_get()

[Gujulan Elango, Hari Prasath (H.)]

From: Hari Prasath Gujulan Elango

This patch replaces the clk_get() with devm_clk_get().
Accordingly,modified the error paths and removed clk_put() as well.

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
---
 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
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 =
 		(struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;
 
-	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 = clk_prepare_enable(st->clk);
 	if (ret) {
 		dev_err(dev, "failed enabling clock\n");
-		goto errout2;
+		goto errout1;
 	}
 
 	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);
-errout2:
-	clk_put(st->clk);
 errout1:
 	iounmap(st->adc_base_spear6xx);
 	return ret;
-- 
1.9.1

Re: [PATCH] staging: iio: replace clk_get() with devm_clk_get()

[Dan Carpenter]

On Thu, Jan 21, 2016 at 09:11:38AM +0000, Gujulan Elango, Hari Prasath (H.) wrote:
> From: Hari Prasath Gujulan Elango
> 

Your email address is missing here.

regards,
dan carpenter

Re: [PATCH] staging: iio: replace clk_get() with devm_clk_get()

[Gujulan Elango, Hari Prasath (H.)]

On Thu, Jan 21, 2016 at 12:45:59PM +0300, Dan Carpenter wrote:
> On Thu, Jan 21, 2016 at 09:11:38AM +0000, Gujulan Elango, Hari Prasath (H=
.) wrote:
> > From: Hari Prasath Gujulan Elango
> >=20
>=20
> Your email address is missing here.
Hello Dan,
Many thanks for notifying.I am sending a v2.

regards,
Hari Prasath

>=20
> regards,
> dan carpenter
> =

Re: [PATCH] staging: iio: replace clk_get() with devm_clk_get()

[Gujulan Elango, Hari Prasath (H.)]

On Thu, Jan 21, 2016 at 12:45:59PM +0300, Dan Carpenter wrote:
> On Thu, Jan 21, 2016 at 09:11:38AM +0000, Gujulan Elango, Hari Prasath (H.) wrote:
> > From: Hari Prasath Gujulan Elango
> > 
> 
> Your email address is missing here.
Hello Dan,
Many thanks for notifying.I am sending a v2.

regards,
Hari Prasath

> 
> regards,
> dan carpenter
> 

Re: [PATCH] staging: iio: replace clk_get() with devm_clk_get()

[Matt Ranostay]

On Thu, Jan 21, 2016 at 1:11 AM, Gujulan Elango, Hari Prasath (H.)
<hgujulan@visteon.com> wrote:
> From: Hari Prasath Gujulan Elango
>
> This patch replaces the clk_get() with devm_clk_get().
> Accordingly,modified the error paths and removed clk_put() as well.
>
> Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
> ---
>  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
> 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 =
>                 (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;
>
> -       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 = clk_prepare_enable(st->clk);
>         if (ret) {
>                 dev_err(dev, "failed enabling clock\n");
> -               goto errout2;
> +               goto errout1;
>         }
>
>         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);

Shouldn't errout3 now be errout2.. having a gap would seem odd.

> -errout2:
> -       clk_put(st->clk);
>  errout1:
>         iounmap(st->adc_base_spear6xx);
>         return ret;
> --
> 1.9.1

Re: [PATCH] staging: iio: replace clk_get() with devm_clk_get()

[Dan Carpenter]

On Thu, Jan 21, 2016 at 11:21:53AM -0800, Matt Ranostay wrote:
> > @@ -356,8 +356,6 @@ static int spear_adc_probe(struct platform_device *pdev)
> >
> >  errout3:
> >         clk_disable_unprepare(st->clk);
> 
> Shouldn't errout3 now be errout2.. having a gap would seem odd.
> 
> > -errout2:
> > -       clk_put(st->clk);
> >  errout1:
> >         iounmap(st->adc_base_spear6xx);

GW-BASIC style numbered gotos are nonsense.  Label names should be name
after what the label does.

err_unprepare:
err_put:
err_iounmap:

But that's something for a different patch, not related to this patch.

regards,
dan carpenter

Re: [PATCH] staging: iio: replace clk_get() with devm_clk_get()

[Gujulan Elango, Hari Prasath (H.)]

On Thu, Jan 21, 2016 at 11:21:53AM -0800, Matt Ranostay wrote:
> On Thu, Jan 21, 2016 at 1:11 AM, Gujulan Elango, Hari Prasath (H.)
> <hgujulan@visteon.com> wrote:
> > From: Hari Prasath Gujulan Elango
> >
> > This patch replaces the clk_get() with devm_clk_get().
> > Accordingly,modified the error paths and removed clk_put() as well.
> >
> > Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
> > ---
> >  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
> > 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;
> >
> > -       st->clk =3D clk_get(dev, NULL);
> > +       st->clk =3D 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);
> >         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)
> >
> >  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:
> > -       clk_put(st->clk);
> >  errout1:
> >         iounmap(st->adc_base_spear6xx);
> >         return ret;
> > --
> > 1.9.1=

Re: [PATCH] staging: iio: replace clk_get() with devm_clk_get()

[Gujulan Elango, Hari Prasath (H.)]

On Thu, Jan 21, 2016 at 11:21:53AM -0800, Matt Ranostay wrote:
> On Thu, Jan 21, 2016 at 1:11 AM, Gujulan Elango, Hari Prasath (H.)
> <hgujulan@visteon.com> wrote:
> > From: Hari Prasath Gujulan Elango
> >
> > This patch replaces the clk_get() with devm_clk_get().
> > Accordingly,modified the error paths and removed clk_put() as well.
> >
> > Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
> > ---
> >  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
> > 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 =
> >                 (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;
> >
> > -       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 = clk_prepare_enable(st->clk);
> >         if (ret) {
> >                 dev_err(dev, "failed enabling clock\n");
> > -               goto errout2;
> > +               goto errout1;
> >         }
> >
> >         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);
> 
> Shouldn't errout3 now be errout2.. having a gap would seem odd.
> 
I agree with you on this. But as Dan says,I would correct it in a
different patch.
> > -errout2:
> > -       clk_put(st->clk);
> >  errout1:
> >         iounmap(st->adc_base_spear6xx);
> >         return ret;
> > --
> > 1.9.1