2022-05-16 13:42:29

by Jiabing Wan

Subject: [PATCH] gpio: ftgpio: Remove unneeded ERROR check before clk_disable_unprepare

clk_disable_unprepare() already checks ERROR by using IS_ERR_OR_NULL.
Remove unneeded ERROR check for g->clk.

Signed-off-by: Wan Jiabing <[email protected]>
---
drivers/gpio/gpio-ftgpio010.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-ftgpio010.c b/drivers/gpio/gpio-ftgpio010.c
index b90a45c939a4..f422c3e129a0 100644
--- a/drivers/gpio/gpio-ftgpio010.c
+++ b/drivers/gpio/gpio-ftgpio010.c
@@ -315,8 +315,8 @@ static int ftgpio_gpio_probe(struct platform_device *pdev)
return 0;

dis_clk:
- if (!IS_ERR(g->clk))
- clk_disable_unprepare(g->clk);
+ clk_disable_unprepare(g->clk);
+
return ret;
}

@@ -324,8 +324,8 @@ static int ftgpio_gpio_remove(struct platform_device *pdev)
{
struct ftgpio_gpio *g = platform_get_drvdata(pdev);

- if (!IS_ERR(g->clk))
- clk_disable_unprepare(g->clk);
+ clk_disable_unprepare(g->clk);
+
return 0;
}

--
2.36.1

2022-05-17 07:29:11

by Bartosz Golaszewski

Subject: Re: [PATCH] gpio: ftgpio: Remove unneeded ERROR check before clk_disable_unprepare

On Mon, May 16, 2022 at 10:50 AM Wan Jiabing <[email protected]> wrote:
>
> clk_disable_unprepare() already checks ERROR by using IS_ERR_OR_NULL.
> Remove unneeded ERROR check for g->clk.
>
> Signed-off-by: Wan Jiabing <[email protected]>
> ---
> drivers/gpio/gpio-ftgpio010.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpio-ftgpio010.c b/drivers/gpio/gpio-ftgpio010.c
> index b90a45c939a4..f422c3e129a0 100644
> --- a/drivers/gpio/gpio-ftgpio010.c
> +++ b/drivers/gpio/gpio-ftgpio010.c
> @@ -315,8 +315,8 @@ static int ftgpio_gpio_probe(struct platform_device *pdev)
> return 0;
>
> dis_clk:
> - if (!IS_ERR(g->clk))
> - clk_disable_unprepare(g->clk);
> + clk_disable_unprepare(g->clk);
> +
> return ret;
> }
>
> @@ -324,8 +324,8 @@ static int ftgpio_gpio_remove(struct platform_device *pdev)
> {
> struct ftgpio_gpio *g = platform_get_drvdata(pdev);
>
> - if (!IS_ERR(g->clk))
> - clk_disable_unprepare(g->clk);
> + clk_disable_unprepare(g->clk);
> +
> return 0;
> }
>
> --
> 2.36.1
>

Applied, thanks!

Bart