| Message ID | 20220926142447.2296872-1-yangyingliang@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [-next,v2] backlight: gpio_backlight: Switch to use dev_err_probe() helper | expand |
On Tue, Sep 27, 2022 at 10:17:32AM +0800, Yang Yingliang wrote: > Hi > > On 2022/9/26 23:32, Daniel Thompson wrote: > > On Mon, Sep 26, 2022 at 10:24:47PM +0800, Yang Yingliang 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. It's more simple in error path. > > > > > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > > > --- > > > v2: > > > Remove "Error: " in error meassage > > > --- > > > drivers/video/backlight/gpio_backlight.c | 10 +++------- > > > 1 file changed, 3 insertions(+), 7 deletions(-) > > > > > > diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c > > > index 6f78d928f054..4ff3939e5f7e 100644 > > > --- a/drivers/video/backlight/gpio_backlight.c > > > +++ b/drivers/video/backlight/gpio_backlight.c > > > @@ -64,13 +64,9 @@ static int gpio_backlight_probe(struct platform_device *pdev) > > > def_value = device_property_read_bool(dev, "default-on"); > > > > > > gbl->gpiod = devm_gpiod_get(dev, NULL, GPIOD_ASIS); > > > - if (IS_ERR(gbl->gpiod)) { > > > - ret = PTR_ERR(gbl->gpiod); > > > - if (ret != -EPROBE_DEFER) > > > - dev_err(dev, > > > - "Error: The gpios parameter is missing or invalid.\n"); > > > - return ret; > > > - } > > > + if (IS_ERR(gbl->gpiod)) > > > + return dev_err_probe(dev, PTR_ERR(gbl->gpiod), > > > + "The gpios parameter is missing or invalid.\n"); > > Why keep the leading "The " ? > OK, I will remove it in v3. > > But you says "the resulting line will read better with a "The " at > beginning" in your last mail, > I am confused about this. That's because my e-mail was confusing! Thanks for fixing it. Daniel.
diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c index 6f78d928f054..4ff3939e5f7e 100644 --- a/drivers/video/backlight/gpio_backlight.c +++ b/drivers/video/backlight/gpio_backlight.c @@ -64,13 +64,9 @@ static int gpio_backlight_probe(struct platform_device *pdev) def_value = device_property_read_bool(dev, "default-on"); gbl->gpiod = devm_gpiod_get(dev, NULL, GPIOD_ASIS); - if (IS_ERR(gbl->gpiod)) { - ret = PTR_ERR(gbl->gpiod); - if (ret != -EPROBE_DEFER) - dev_err(dev, - "Error: The gpios parameter is missing or invalid.\n"); - return ret; - } + if (IS_ERR(gbl->gpiod)) + return dev_err_probe(dev, PTR_ERR(gbl->gpiod), + "The gpios parameter is missing or invalid.\n"); memset(&props, 0, sizeof(props)); props.type = BACKLIGHT_RAW;
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. It's more simple in error path. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- v2: Remove "Error: " in error meassage --- drivers/video/backlight/gpio_backlight.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)