Message ID | 20220920153055.3465115-1-yangyingliang@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [-next,1/4] Input: adc-joystick - Switch to use dev_err_probe() helper | expand |
Hi Yang, Thank you for your patch, On Tue, Sep 20, 2022 at 23:30, Yang Yingliang <yangyingliang@huawei.com> wrote: > In the probe path, dev_err() can be replaced with dev_err_probe() > which will check if error code is -EPROBE_DEFER and prints the > error name. It also sets the defer probe reason which can be > checked later through debugfs. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > drivers/input/joystick/adc-joystick.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c > index c0deff5d4282..3590d845e381 100644 > --- a/drivers/input/joystick/adc-joystick.c > +++ b/drivers/input/joystick/adc-joystick.c > @@ -201,12 +201,9 @@ static int adc_joystick_probe(struct platform_device *pdev) > return -ENOMEM; > > joy->chans = devm_iio_channel_get_all(dev); > - if (IS_ERR(joy->chans)) { > - error = PTR_ERR(joy->chans); > - if (error != -EPROBE_DEFER) > - dev_err(dev, "Unable to get IIO channels"); > - return error; > - } > + if (IS_ERR(joy->chans)) > + return dev_err_probe(dev, PTR_ERR(joy->chans), > + "Unable to get IIO channels\n"); If we look at the input tree, we can see that there is no occurence of dev_err_probe(): $ ~/src/linux/drivers/input/ 483fed3b5dc8 grep -rsn dev_err_probe $ ~/src/linux/drivers/input/ 483fed3b5dc8 The reason for this is that the input maintainer (Dmitry) dislikes dev_err_probe() as he stated in [1] So I don't think he will apply this. Regards, Mattijs [1] https://lore.kernel.org/r/YWTpg35wyYS1uoFZ@google.com > > error = device_property_read_u32(dev, "poll-interval", &poll_interval); > if (error) { > -- > 2.25.1
diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c index c0deff5d4282..3590d845e381 100644 --- a/drivers/input/joystick/adc-joystick.c +++ b/drivers/input/joystick/adc-joystick.c @@ -201,12 +201,9 @@ static int adc_joystick_probe(struct platform_device *pdev) return -ENOMEM; joy->chans = devm_iio_channel_get_all(dev); - if (IS_ERR(joy->chans)) { - error = PTR_ERR(joy->chans); - if (error != -EPROBE_DEFER) - dev_err(dev, "Unable to get IIO channels"); - return error; - } + if (IS_ERR(joy->chans)) + return dev_err_probe(dev, PTR_ERR(joy->chans), + "Unable to get IIO channels\n"); error = device_property_read_u32(dev, "poll-interval", &poll_interval); if (error) {
In the probe path, dev_err() can be replaced with dev_err_probe() which will check if error code is -EPROBE_DEFER and prints the error name. It also sets the defer probe reason which can be checked later through debugfs. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/input/joystick/adc-joystick.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)