target/linux/mediatek/patches-5.15/844-v5.18-i2c-mediatek-remove-redundant-null-check.patch

   1 From eb4a2ae019815946f574cd9f8209e12bdcd8fd34 Mon Sep 17 00:00:00 2001
   2 From: Xu Wang <vulab@iscas.ac.cn>
   3 Date: Wed, 30 Sep 2020 08:42:33 +0000
   4 Subject: [PATCH 05/16] i2c: mediatek: remove redundant null check
   5
   6 Because clk_disable_unprepare already checked NULL clock parameter,
   7 so the additional checks are unnecessary, just remove it
   8
   9 Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
  10 Reviewed-by: Qii Wang <qii.wang@mediatek.com>
  11 Signed-off-by: Wolfram Sang <wsa@kernel.org>
  12 ---
  13  drivers/i2c/busses/i2c-mt65xx.c | 9 +++------
  14  1 file changed, 3 insertions(+), 6 deletions(-)
  15
  16 --- a/drivers/i2c/busses/i2c-mt65xx.c
  17 +++ b/drivers/i2c/busses/i2c-mt65xx.c
  18 @@ -476,8 +476,7 @@ static int mtk_i2c_clock_enable(struct m
  19         return 0;
  20
  21  err_arb:
  22 -       if (i2c->have_pmic)
  23 -               clk_disable_unprepare(i2c->clk_pmic);
  24 +       clk_disable_unprepare(i2c->clk_pmic);
  25  err_pmic:
  26         clk_disable_unprepare(i2c->clk_main);
  27  err_main:
  28 @@ -488,11 +487,9 @@ err_main:
  29
  30  static void mtk_i2c_clock_disable(struct mtk_i2c *i2c)
  31  {
  32 -       if (i2c->clk_arb)
  33 -               clk_disable_unprepare(i2c->clk_arb);
  34 +       clk_disable_unprepare(i2c->clk_arb);
  35
  36 -       if (i2c->have_pmic)
  37 -               clk_disable_unprepare(i2c->clk_pmic);
  38 +       clk_disable_unprepare(i2c->clk_pmic);
  39
  40         clk_disable_unprepare(i2c->clk_main);
  41         clk_disable_unprepare(i2c->clk_dma);