[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160115075356.GI24441@pengutronix.de>
Date: Fri, 15 Jan 2016 08:53:56 +0100
From: Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>
To: Li Yang <leoyang.li@....com>
Cc: Wolfram Sang <wsa@...-dreams.de>, linux-i2c@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
Linus Walleij <linus.walleij@...aro.org>,
linux-gpio@...r.kernel.org, Gao Pan <pandy.gao@....com>
Subject: Re: [PATCH v3] i2c: imx: make bus recovery through pinctrl optional
Hello,
On Fri, Jan 15, 2016 at 01:27:24AM -0600, Li Yang wrote:
> diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
> index a2b132c..1239bfa 100644
> --- a/drivers/i2c/busses/i2c-imx.c
> +++ b/drivers/i2c/busses/i2c-imx.c
> @@ -1081,8 +1081,11 @@ static int i2c_imx_probe(struct platform_device *pdev)
> return ret;
> }
>
> + /* optional bus recovery feature through pinctrl */
> i2c_imx->pinctrl = devm_pinctrl_get(&pdev->dev);
> - if (IS_ERR(i2c_imx->pinctrl)) {
> + /* bailout on -ENOMEM or -EPROBE_DEFER, continue for other errors */
> + if (PTR_ERR(i2c_imx->pinctrl) == -ENOMEM ||
> + PTR_ERR(i2c_imx->pinctrl) == -EPROBE_DEFER) {
> ret = PTR_ERR(i2c_imx->pinctrl);
> goto clk_disable;
> }
> @@ -1125,7 +1128,10 @@ static int i2c_imx_probe(struct platform_device *pdev)
> i2c_imx, IMX_I2C_I2CR);
> imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
>
> - i2c_imx_init_recovery_info(i2c_imx, pdev);
> + if (IS_ERR_OR_NULL(i2c_imx->pinctrl))
I'd prefer to set i2c_imx->pinctrl to NULL if it's not used and then use
if (!i2c_imx->pinctrl)
here. (Or maybe make i2c_imx_init_recovery_info aware of this situation
to keep the caller simple?)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Powered by blists - more mailing lists