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

From: Guenter Roeck
Date: Mon Apr 29 2013 - 12:44:30 EST


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@xxxxxxxxxxx>

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@xxxxxxxxxxxx>

> ---
> 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@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/