Thread (11 messages) 11 messages, 7 authors, 2023-08-18

Re: [PATCH -next v2] I2C: Fix return value check for devm_pinctrl_get()

From: Nicolas Ferre <nicolas.ferre@microchip.com>
Date: 2023-08-17 16:02:50
Also in: linux-i2c

On 17/08/2023 at 04:20, Ruan Jinjie wrote:
The devm_pinctrl_get() function returns error pointers and never
returns NULL. Update the checks accordingly.

Fixes: 543aa2c4da8b ("i2c: at91: Move to generic GPIO bus recovery")
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
quoted hunk ↗ jump to hunk
Fixes: fd8961c5ba9e ("i2c: imx: make bus recovery through pinctrl optional")
Signed-off-by: Ruan Jinjie <redacted>
---
v2:
- Remove NULL check instead of using IS_ERR_OR_NULL() to avoid leaving them behind.
- Update the commit title and message.
---
  drivers/i2c/busses/i2c-at91-master.c | 2 +-
  drivers/i2c/busses/i2c-imx.c         | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-at91-master.c b/drivers/i2c/busses/i2c-at91-master.c
index 94cff1cd527e..2bf1df5ef473 100644
--- a/drivers/i2c/busses/i2c-at91-master.c
+++ b/drivers/i2c/busses/i2c-at91-master.c
@@ -831,7 +831,7 @@ static int at91_init_twi_recovery_gpio(struct platform_device *pdev,
         struct i2c_bus_recovery_info *rinfo = &dev->rinfo;

         rinfo->pinctrl = devm_pinctrl_get(&pdev->dev);
-       if (!rinfo->pinctrl || IS_ERR(rinfo->pinctrl)) {
+       if (IS_ERR(rinfo->pinctrl)) {
                 dev_info(dev->dev, "can't get pinctrl, bus recovery not supported\n");
                 return PTR_ERR(rinfo->pinctrl);
         }
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 10e89586ca72..05d55893f04e 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1388,7 +1388,7 @@ static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx,
         struct i2c_bus_recovery_info *rinfo = &i2c_imx->rinfo;

         i2c_imx->pinctrl = devm_pinctrl_get(&pdev->dev);
-       if (!i2c_imx->pinctrl || IS_ERR(i2c_imx->pinctrl)) {
+       if (IS_ERR(i2c_imx->pinctrl)) {
                 dev_info(&pdev->dev, "can't get pinctrl, bus recovery not supported\n");
                 return PTR_ERR(i2c_imx->pinctrl);
         }
--
2.34.1

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help