2020-09-30 08:45:44

by Xu Wang

[permalink] [raw]

Subject: [PATCH] i2c: mediatek: remove redundant null check

---

Because clk_disable_unprepare already checked NULL clock parameter,
so the additional checks are unnecessary, just remove it

Signed-off-by: Xu Wang <[email protected]>
---
drivers/i2c/busses/i2c-mt65xx.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index 0cbdfbe605b5..48d37de827e1 100644
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -449,8 +449,7 @@ static int mtk_i2c_clock_enable(struct mtk_i2c *i2c)
return 0;

err_arb:
- if (i2c->have_pmic)
- clk_disable_unprepare(i2c->clk_pmic);
+ clk_disable_unprepare(i2c->clk_pmic);
err_pmic:
clk_disable_unprepare(i2c->clk_main);
err_main:
@@ -461,11 +460,9 @@ static int mtk_i2c_clock_enable(struct mtk_i2c *i2c)

static void mtk_i2c_clock_disable(struct mtk_i2c *i2c)
{
- if (i2c->clk_arb)
- clk_disable_unprepare(i2c->clk_arb);
+ clk_disable_unprepare(i2c->clk_arb);

- if (i2c->have_pmic)
- clk_disable_unprepare(i2c->clk_pmic);
+ clk_disable_unprepare(i2c->clk_pmic);

clk_disable_unprepare(i2c->clk_main);
clk_disable_unprepare(i2c->clk_dma);
--
2.17.1

2020-10-26 06:21:37

by Qii Wang (王琪)

[permalink] [raw]

Subject: Re: [PATCH] i2c: mediatek: remove redundant null check

---

Thanks, it looks good for me, it would be better to remove all useless
members

On Wed, 2020-09-30 at 08:42 +0000, Xu Wang wrote:
> Because clk_disable_unprepare already checked NULL clock parameter,
> so the additional checks are unnecessary, just remove it
>
> Signed-off-by: Xu Wang <[email protected]>
> ---
> drivers/i2c/busses/i2c-mt65xx.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
> index 0cbdfbe605b5..48d37de827e1 100644
> --- a/drivers/i2c/busses/i2c-mt65xx.c
> +++ b/drivers/i2c/busses/i2c-mt65xx.c
> @@ -449,8 +449,7 @@ static int mtk_i2c_clock_enable(struct mtk_i2c *i2c)
> return 0;
>
> err_arb:
> - if (i2c->have_pmic)
> - clk_disable_unprepare(i2c->clk_pmic);
> + clk_disable_unprepare(i2c->clk_pmic);
> err_pmic:
> clk_disable_unprepare(i2c->clk_main);
> err_main:
> @@ -461,11 +460,9 @@ static int mtk_i2c_clock_enable(struct mtk_i2c *i2c)
>
> static void mtk_i2c_clock_disable(struct mtk_i2c *i2c)
> {
> - if (i2c->clk_arb)
> - clk_disable_unprepare(i2c->clk_arb);
> + clk_disable_unprepare(i2c->clk_arb);
>
> - if (i2c->have_pmic)
> - clk_disable_unprepare(i2c->clk_pmic);
> + clk_disable_unprepare(i2c->clk_pmic);
>
> clk_disable_unprepare(i2c->clk_main);
> clk_disable_unprepare(i2c->clk_dma);

2022-03-01 16:18:24

by Wolfram Sang

[permalink] [raw]

Subject: Re: [PATCH] i2c: mediatek: remove redundant null check

---

On Wed, Sep 30, 2020 at 08:42:33AM +0000, Xu Wang wrote:
> Because clk_disable_unprepare already checked NULL clock parameter,
> so the additional checks are unnecessary, just remove it
>
> Signed-off-by: Xu Wang <[email protected]>

Missed Qii Wang's ack so far, sorry. Applied to for-next, thanks!

---

Attachments:

(No filename) (310.00 B)
signature.asc (849.00 B)
Download all attachments