844-v5.18-i2c-mediatek-remove-redundant-null-check.patch 1.2 KB

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