On Wed, Aug 16, 2023 at 05:46:18PM +0800, Ruan Jinjie wrote:
> Use IS_ERR_OR_NULL() instead of open-coding it
> to simplify the code.
>
> Signed-off-by: Ruan Jinjie <ruanjinjie@xxxxxxxxxx>
> ---
> 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..0e454c04a145 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_OR_NULL(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..8807c90df749 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_OR_NULL(i2c_imx->pinctrl)) {
> dev_info(&pdev->dev, "can't get pinctrl, bus recovery not supported\n");
> return PTR_ERR(i2c_imx->pinctrl);
> }
As stated in my previous reply to a similar patch, devm_pinctrl_get()
can not return NULL, so it makes more sense to remove the test for NULL
rather than "cleaning up" the buggy code, but leaving the bugs behind.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
