2020-12-18 09:54:50

by Xu Wang

Subject: [PATCH] iio: frequency: adf4350: Remove redundant null check before clk_disable_unprepare

Because clk_disable_unprepare() already checked NULL clock parameter,
so the additional check is unnecessary, just remove it.

Signed-off-by: Xu Wang <[email protected]>
---
drivers/iio/frequency/adf4350.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index 82c050a3899d..1462a6a5bc6d 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -582,8 +582,7 @@ static int adf4350_probe(struct spi_device *spi)
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
error_disable_clk:
- if (clk)
- clk_disable_unprepare(clk);
+ clk_disable_unprepare(clk);

return ret;
}
@@ -599,8 +598,7 @@ static int adf4350_remove(struct spi_device *spi)

iio_device_unregister(indio_dev);

- if (st->clk)
- clk_disable_unprepare(st->clk);
+ clk_disable_unprepare(st->clk);

if (!IS_ERR(reg))
regulator_disable(reg);
--
2.17.1

2020-12-29 17:15:05

by Jonathan Cameron

Subject: Re: [PATCH] iio: frequency: adf4350: Remove redundant null check before clk_disable_unprepare

On Fri, 18 Dec 2020 09:46:47 +0000
Xu Wang <[email protected]> wrote:

> Because clk_disable_unprepare() already checked NULL clock parameter,
> so the additional check is unnecessary, just remove it.
>
> Signed-off-by: Xu Wang <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders
to see if they can find anything we missed.

Thanks,

Jonathan

> ---
> drivers/iio/frequency/adf4350.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
> index 82c050a3899d..1462a6a5bc6d 100644
> --- a/drivers/iio/frequency/adf4350.c
> +++ b/drivers/iio/frequency/adf4350.c
> @@ -582,8 +582,7 @@ static int adf4350_probe(struct spi_device *spi)
> if (!IS_ERR(st->reg))
> regulator_disable(st->reg);
> error_disable_clk:
> - if (clk)
> - clk_disable_unprepare(clk);
> + clk_disable_unprepare(clk);
>
> return ret;
> }
> @@ -599,8 +598,7 @@ static int adf4350_remove(struct spi_device *spi)
>
> iio_device_unregister(indio_dev);
>
> - if (st->clk)
> - clk_disable_unprepare(st->clk);
> + clk_disable_unprepare(st->clk);
>
> if (!IS_ERR(reg))
> regulator_disable(reg);