[PATCH RESEND 1/2] watchdog: mtx1-wdt: use devm_gpio_request_one()

[PATCH RESEND 1/2] watchdog: mtx1-wdt: use devm_gpio_request_one()

[Jingoo Han]

Use devm_gpio_request_one() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/watchdog/mtx-1_wdt.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 14dab6f..b434111 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -209,7 +209,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
 	int ret;
 
 	mtx1_wdt_device.gpio = pdev->resource[0].start;
-	ret = gpio_request_one(mtx1_wdt_device.gpio,
+	ret = devm_gpio_request_one(&pdev->dev, mtx1_wdt_device.gpio,
 				GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
 	if (ret < 0) {
 		dev_err(&pdev->dev, "failed to request gpio");
@@ -241,7 +241,6 @@ static int mtx1_wdt_remove(struct platform_device *pdev)
 		wait_for_completion(&mtx1_wdt_device.stop);
 	}
 
-	gpio_free(mtx1_wdt_device.gpio);
 	misc_deregister(&mtx1_wdt_misc);
 	return 0;
 }
-- 
1.7.2.5

Re: [PATCH RESEND 1/2] watchdog: mtx1-wdt: use devm_gpio_request_one()

[Guenter Roeck]

On Mon, Apr 29, 2013 at 06:30:43PM +0900, Jingoo Han wrote:
> Use devm_gpio_request_one() to make cleanup paths simpler.
> 
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>

This patch also addresses the missing gpio_free in the probe error path
(if the call to misc_register() fails).

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/mtx-1_wdt.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
> index 14dab6f..b434111 100644
> --- a/drivers/watchdog/mtx-1_wdt.c
> +++ b/drivers/watchdog/mtx-1_wdt.c
> @@ -209,7 +209,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
>  	int ret;
>  
>  	mtx1_wdt_device.gpio = pdev->resource[0].start;
> -	ret = gpio_request_one(mtx1_wdt_device.gpio,
> +	ret = devm_gpio_request_one(&pdev->dev, mtx1_wdt_device.gpio,
>  				GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
>  	if (ret < 0) {
>  		dev_err(&pdev->dev, "failed to request gpio");
> @@ -241,7 +241,6 @@ static int mtx1_wdt_remove(struct platform_device *pdev)
>  		wait_for_completion(&mtx1_wdt_device.stop);
>  	}
>  
> -	gpio_free(mtx1_wdt_device.gpio);
>  	misc_deregister(&mtx1_wdt_misc);
>  	return 0;
>  }
> -- 
> 1.7.2.5
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH RESEND 1/2] watchdog: mtx1-wdt: use devm_gpio_request_one()

[Jingoo Han]

On Tuesday, April 30, 2013 1:44 AM, Guenter Roeck wrote:
> On Mon, Apr 29, 2013 at 06:30:43PM +0900, Jingoo Han wrote:
> > Use devm_gpio_request_one() to make cleanup paths simpler.
> >
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> 
> This patch also addresses the missing gpio_free in the probe error path
> (if the call to misc_register() fails).

When devm_gpio_request_one() is used, there is no need to call
devm_gpio_free().

It is because, these resource managed functions such as
devm_gpio_request_one() allow the driver core to automatically
clean up any allocation, when probe function fails.

> 
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>

Thank you for your reviewing.

Best regards,
Jingoo Han

> 
> > ---
> >  drivers/watchdog/mtx-1_wdt.c |    3 +--
> >  1 files changed, 1 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
> > index 14dab6f..b434111 100644
> > --- a/drivers/watchdog/mtx-1_wdt.c
> > +++ b/drivers/watchdog/mtx-1_wdt.c
> > @@ -209,7 +209,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
> >  	int ret;
> >
> >  	mtx1_wdt_device.gpio = pdev->resource[0].start;
> > -	ret = gpio_request_one(mtx1_wdt_device.gpio,
> > +	ret = devm_gpio_request_one(&pdev->dev, mtx1_wdt_device.gpio,
> >  				GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
> >  	if (ret < 0) {
> >  		dev_err(&pdev->dev, "failed to request gpio");
> > @@ -241,7 +241,6 @@ static int mtx1_wdt_remove(struct platform_device *pdev)
> >  		wait_for_completion(&mtx1_wdt_device.stop);
> >  	}
> >
> > -	gpio_free(mtx1_wdt_device.gpio);
> >  	misc_deregister(&mtx1_wdt_misc);
> >  	return 0;
> >  }
> > --
> > 1.7.2.5
> >
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >

Re: [PATCH RESEND 1/2] watchdog: mtx1-wdt: use devm_gpio_request_one()

[Guenter Roeck]

On Tue, Apr 30, 2013 at 10:54:03AM +0900, Jingoo Han wrote:
> On Tuesday, April 30, 2013 1:44 AM, Guenter Roeck wrote:
> > On Mon, Apr 29, 2013 at 06:30:43PM +0900, Jingoo Han wrote:
> > > Use devm_gpio_request_one() to make cleanup paths simpler.
> > >
> > > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > 
> > This patch also addresses the missing gpio_free in the probe error path
> > (if the call to misc_register() fails).
> 
> When devm_gpio_request_one() is used, there is no need to call
> devm_gpio_free().
> 
> It is because, these resource managed functions such as
> devm_gpio_request_one() allow the driver core to automatically
> clean up any allocation, when probe function fails.
> 
I am well aware of this.

I said this patch _addresses_ a problem, not that it creates one.

Guenter

Re: [PATCH RESEND 1/2] watchdog: mtx1-wdt: use devm_gpio_request_one()

[Wim Van Sebroeck]

Hi Jingoo,

> Use devm_gpio_request_one() to make cleanup paths simpler.
> 
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/watchdog/mtx-1_wdt.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 

Patch added to linux-watchdog-next.

Kind regards,
Wim.