renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 22:53:55 +08:00
Code

i2c: designware: make use of devm_gpiod_get_optional

Browse Source 
There is a semantical change: if devm_gpiod_get_optional returns -ENOSYS
this is passed as error to the caller. This effectively reverts commit
d1fa74520d ("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.

Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Uwe Kleine-König 2019-07-25 22:21:36 +02:00 committed by Wolfram Sang
parent 684ca71259
commit 33eb09a02e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/i2c/busses/i2c-designware-master.c
View File

@ -657,13 +657,10 @@ static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev)
struct gpio_desc *gpio; struct gpio_desc *gpio;
int r; int r;
gpio = devm_gpiod_get(dev->dev, "scl", GPIOD_OUT_HIGH); gpio = devm_gpiod_get_optional(dev->dev, "scl", GPIOD_OUT_HIGH);
if (IS_ERR(gpio)) { if (IS_ERR_OR_NULL(gpio))
r = PTR_ERR(gpio); return PTR_ERR_OR_ZERO(gpio);
if (r == -ENOENT || r == -ENOSYS)
return 0;
return r;
}
rinfo->scl_gpiod = gpio; rinfo->scl_gpiod = gpio;
gpio = devm_gpiod_get_optional(dev->dev, "sda", GPIOD_IN); gpio = devm_gpiod_get_optional(dev->dev, "sda", GPIOD_IN);