From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753892AbcAOHyD (ORCPT ); Fri, 15 Jan 2016 02:54:03 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:38756 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbcAOHyB (ORCPT ); Fri, 15 Jan 2016 02:54:01 -0500 Date: Fri, 15 Jan 2016 08:53:56 +0100 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= To: Li Yang Cc: Wolfram Sang , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij , linux-gpio@vger.kernel.org, Gao Pan Subject: Re: [PATCH v3] i2c: imx: make bus recovery through pinctrl optional Message-ID: <20160115075356.GI24441@pengutronix.de> References: <1452842844-16256-1-git-send-email-leoyang.li@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1452842844-16256-1-git-send-email-leoyang.li@nxp.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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/ |