| Message ID | 20160601013007.GA13021@dtor-ws (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, May 31, 2016 at 6:30 PM, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > We should not be ignoring -EPROBE_DEFER reported by > devm_gpiod_get_optional(), but report it as any other error to the upper > layers. While we are at it simplify check for the presence of reset GPIO > and instead of using IS_ERR_OR_NULL just use boolean. > > Also do not return -ENOMEM from suspend handler when the device in > bootloader mode as that does not make sense and switch to -EBUSY instead. > > Reported-by: Guenter Roeck <groeck@chromium.org> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> > --- > drivers/input/touchscreen/raydium_i2c_ts.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c > index 1ae65f6..f3076d9 100644 > --- a/drivers/input/touchscreen/raydium_i2c_ts.c > +++ b/drivers/input/touchscreen/raydium_i2c_ts.c > @@ -930,7 +930,7 @@ static int raydium_i2c_power_on(struct raydium_data *ts) > { > int error; > > - if (IS_ERR_OR_NULL(ts->reset_gpio)) > + if (!ts->reset_gpio) > return 0; > > gpiod_set_value_cansleep(ts->reset_gpio, 1); > @@ -967,7 +967,7 @@ static void raydium_i2c_power_off(void *_data) > { > struct raydium_data *ts = _data; > > - if (!IS_ERR_OR_NULL(ts->reset_gpio)) { > + if (ts->reset_gpio) { > gpiod_set_value_cansleep(ts->reset_gpio, 1); > regulator_disable(ts->vccio); > regulator_disable(ts->avdd); > @@ -1018,11 +1018,10 @@ static int raydium_i2c_probe(struct i2c_client *client, > GPIOD_OUT_LOW); > if (IS_ERR(ts->reset_gpio)) { > error = PTR_ERR(ts->reset_gpio); > - if (error != -EPROBE_DEFER) { > + if (error != -EPROBE_DEFER) > dev_err(&client->dev, > "failed to get reset gpio: %d\n", error); > - return error; > - } > + return error; > } > > error = raydium_i2c_power_on(ts); > @@ -1138,7 +1137,7 @@ static int __maybe_unused raydium_i2c_suspend(struct device *dev) > > /* Sleep is not available in BLDR recovery mode */ > if (ts->boot_mode != RAYDIUM_TS_MAIN) > - return -ENOMEM; > + return -EBUSY; > > disable_irq(client->irq); > > -- > 2.8.0.rc3.226.g39d4020 > > > -- > Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c index 1ae65f6..f3076d9 100644 --- a/drivers/input/touchscreen/raydium_i2c_ts.c +++ b/drivers/input/touchscreen/raydium_i2c_ts.c @@ -930,7 +930,7 @@ static int raydium_i2c_power_on(struct raydium_data *ts) { int error; - if (IS_ERR_OR_NULL(ts->reset_gpio)) + if (!ts->reset_gpio) return 0; gpiod_set_value_cansleep(ts->reset_gpio, 1); @@ -967,7 +967,7 @@ static void raydium_i2c_power_off(void *_data) { struct raydium_data *ts = _data; - if (!IS_ERR_OR_NULL(ts->reset_gpio)) { + if (ts->reset_gpio) { gpiod_set_value_cansleep(ts->reset_gpio, 1); regulator_disable(ts->vccio); regulator_disable(ts->avdd); @@ -1018,11 +1018,10 @@ static int raydium_i2c_probe(struct i2c_client *client, GPIOD_OUT_LOW); if (IS_ERR(ts->reset_gpio)) { error = PTR_ERR(ts->reset_gpio); - if (error != -EPROBE_DEFER) { + if (error != -EPROBE_DEFER) dev_err(&client->dev, "failed to get reset gpio: %d\n", error); - return error; - } + return error; } error = raydium_i2c_power_on(ts); @@ -1138,7 +1137,7 @@ static int __maybe_unused raydium_i2c_suspend(struct device *dev) /* Sleep is not available in BLDR recovery mode */ if (ts->boot_mode != RAYDIUM_TS_MAIN) - return -ENOMEM; + return -EBUSY; disable_irq(client->irq);
We should not be ignoring -EPROBE_DEFER reported by devm_gpiod_get_optional(), but report it as any other error to the upper layers. While we are at it simplify check for the presence of reset GPIO and instead of using IS_ERR_OR_NULL just use boolean. Also do not return -ENOMEM from suspend handler when the device in bootloader mode as that does not make sense and switch to -EBUSY instead. Reported-by: Guenter Roeck <groeck@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/touchscreen/raydium_i2c_ts.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)