On Thu, Jul 25, 2019 at 10:21:36PM +0200, Uwe Kleine-König wrote: > There is a semantical change: if devm_gpiod_get_optional returns -ENOSYS > this is passed as error to the caller. This effectively reverts commit > d1fa74520dcd ("i2c: designware: Consider SCL GPIO optional") which > shouldn't be necessary any more since gpiod_get_optional doesn't return > -ENOSYS any more with GPIOLIB=n. I like this! Thanks and take mine Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> > > Signed-off-by: Uwe Kleine-König <uwe@xxxxxxxxxxxxxxxxx> > --- > drivers/i2c/busses/i2c-designware-master.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c > index d464799e40a3..867787dade43 100644 > --- a/drivers/i2c/busses/i2c-designware-master.c > +++ b/drivers/i2c/busses/i2c-designware-master.c > @@ -657,13 +657,10 @@ static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev) > struct gpio_desc *gpio; > int r; > > - gpio = devm_gpiod_get(dev->dev, "scl", GPIOD_OUT_HIGH); > - if (IS_ERR(gpio)) { > - r = PTR_ERR(gpio); > - if (r == -ENOENT || r == -ENOSYS) > - return 0; > - return r; > - } > + gpio = devm_gpiod_get_optional(dev->dev, "scl", GPIOD_OUT_HIGH); > + if (IS_ERR_OR_NULL(gpio)) > + return PTR_ERR_OR_ZERO(gpio); > + > rinfo->scl_gpiod = gpio; > > gpio = devm_gpiod_get_optional(dev->dev, "sda", GPIOD_IN); > -- > 2.20.1 > -- With Best Regards, Andy Shevchenko