[PATCH] i2c: cadence: make bus recovery optional

[Michael Grzeschik]

On Sun, Oct 23, 2022 at 11:51:21PM +0200, Michael Grzeschik wrote:
>There is no need for the i2c driver to have functional bus recovery to
>probe successfully. We patch this by only adding bus_recovery_info only
>if we get usable pinctrl data.

Gentle Ping!

>Signed-off-by: Michael Grzeschik <m.grzeschik at pengutronix.de>
>---
> drivers/i2c/busses/i2c-cadence.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
>index fe0cd205502de9..cf212b8ffd56af 100644
>--- a/drivers/i2c/busses/i2c-cadence.c
>+++ b/drivers/i2c/busses/i2c-cadence.c
>@@ -1262,10 +1262,10 @@ static int cdns_i2c_probe(struct platform_device *pdev)
> 	}
>
> 	id->rinfo.pinctrl = devm_pinctrl_get(&pdev->dev);
>-	if (IS_ERR(id->rinfo.pinctrl)) {
>+	if (!IS_ERR(id->rinfo.pinctrl))
>+		id->adap.bus_recovery_info = &id->rinfo;
>+	else
> 		dev_info(&pdev->dev, "can't get pinctrl, bus recovery not supported\n");
>-		return PTR_ERR(id->rinfo.pinctrl);
>-	}
>
> 	id->membase = devm_platform_get_and_ioremap_resource(pdev, 0, &r_mem);
> 	if (IS_ERR(id->membase))
>@@ -1283,7 +1283,6 @@ static int cdns_i2c_probe(struct platform_device *pdev)
> 	id->adap.retries = 3;		/* Default retry value. */
> 	id->adap.algo_data = id;
> 	id->adap.dev.parent = &pdev->dev;
>-	id->adap.bus_recovery_info = &id->rinfo;
> 	init_completion(&id->xfer_done);
> 	snprintf(id->adap.name, sizeof(id->adap.name),
> 		 "Cadence I2C at %08lx", (unsigned long)r_mem->start);
>-- 
>2.30.2
>
>
>

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20221114/b74b87cf/attachment.sig>