pinctrl: Don't override the error code in probe error handling
Subsystems (4)
PATCH 1/2 pinctrl: Don't override the error code in probe error handling
Otherwise, we return 0 in probe error paths when gpiochip_remove() returns 0. Also show error message if gpiochip_remove() fails.
--- drivers/pinctrl/pinctrl-coh901.c | 3 ++- drivers/pinctrl/pinctrl-sunxi.c | 3 ++- drivers/pinctrl/vt8500/pinctrl-wmt.c | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/pinctrl/pinctrl-coh901.c +2 -1
@@ -830,7 +830,8 @@ static int __init u300_gpio_probe(struct platform_device *pdev)return 0 ; err_no_range: - err =gpiochip_remove (&gpio->chip); +if (gpiochip_remove (&gpio->chip)) +dev_err (&pdev->dev,"failed to remove gpio chip\n" ); err_no_chip: err_no_domain: err_no_port:
drivers/pinctrl/pinctrl-sunxi.c +2 -1
@@ -2000,7 +2000,8 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)return 0 ; gpiochip_error: - ret =gpiochip_remove (pctl->chip); +if (gpiochip_remove (pctl->chip)) +dev_err (&pdev->dev,"failed to remove gpio chip\n" ); pinctrl_error:pinctrl_unregister (pctl->pctl_dev);return ret;
drivers/pinctrl/vt8500/pinctrl-wmt.c +1 -2
@@ -609,8 +609,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev,return 0 ; fail_range: - err =gpiochip_remove (&data->gpio_chip); -if (err) +if (gpiochip_remove (&data->gpio_chip))dev_err (&pdev->dev,"failed to remove gpio chip\n" ); fail_gpio:pinctrl_unregister (data->pctl_dev);
Signature · 1 line
1.8.1.2
PATCH 2/2 gpio: Don't override the error code in probe error handling
Otherwise, we return 0 in probe error paths when gpiochip_remove() returns 0. Also show error message if gpiochip_remove() fails.
--- drivers/gpio/gpio-ml-ioh.c | 3 +-- drivers/gpio/gpio-pch.c | 3 +-- drivers/gpio/gpio-sch.c | 6 ++---- drivers/gpio/gpio-viperboard.c | 3 ++- 4 files changed, 6 insertions(+), 9 deletions(-)
drivers/gpio/gpio-ml-ioh.c +1 -2
@@ -496,8 +496,7 @@ err_irq_alloc_descs: err_gpiochip_add:while (--i >=0 ) { chip--; - ret =gpiochip_remove (&chip->gpio); -if (ret) +if (gpiochip_remove (&chip->gpio))dev_err (&pdev->dev,"Failed gpiochip_remove(%d)\n" , i); }kfree (chip_save);
drivers/gpio/gpio-pch.c +1 -2
@@ -424,8 +424,7 @@ end: err_request_irq:irq_free_descs (irq_base, gpio_pins[chip->ioh]); - ret =gpiochip_remove (&chip->gpio); -if (ret) +if (gpiochip_remove (&chip->gpio))dev_err (&pdev->dev,"%s gpiochip_remove failed\n" , __func__); err_gpiochip_add:
drivers/gpio/gpio-sch.c +2 -4
@@ -272,10 +272,8 @@ static int sch_gpio_probe(struct platform_device *pdev)return 0 ; err_sch_gpio_resume: - err =gpiochip_remove (&sch_gpio_core); -if (err) -dev_err (&pdev->dev,"%s failed, %d\n" , -"gpiochip_remove()" , err); +if (gpiochip_remove (&sch_gpio_core)) +dev_err (&pdev->dev,"%s gpiochip_remove failed\n" , __func__); err_sch_gpio_core:release_region (res->start,resource_size (res));
drivers/gpio/gpio-viperboard.c +2 -1
@@ -446,7 +446,8 @@ static int vprbrd_gpio_probe(struct platform_device *pdev)return ret; err_gpiob: - ret =gpiochip_remove (&vb_gpio->gpioa); +if (gpiochip_remove (&vb_gpio->gpioa)) +dev_err (&pdev->dev,"%s gpiochip_remove failed\n" , __func__); err_gpioa:return ret;
Signature · 1 line
1.8.1.2
Re: [PATCH 2/2] gpio: Don't override the error code in probe error handling
Quoted 7 lines · Axel Lin
Otherwise, we return 0 in probe error paths when
gpiochip_remove()returns 0. Also show error message ifgpiochip_remove()fails.Signed-off-by Axel Lin <[email protected]>Cc Tomoya MORINAGA <[email protected]>Cc Denis Turischev <[email protected]>Cc Lars Poeschel <[email protected]>
Good spot Axel!
Patch applied for rc-fixes.
Yours,
Linus Walleij
Quoted 46 lines · Axel Lin
Otherwise, we return 0 in probe error paths when
gpiochip_remove()returns 0. Also show error message ifgpiochip_remove()fails.Signed-off-by Axel Lin <[email protected]>Cc Linus Walleij <[email protected]>Cc Maxime Ripard <[email protected]>Cc Tony Prisk <[email protected]>--- drivers/pinctrl/pinctrl-coh901.c | 3 ++- drivers/pinctrl/pinctrl-sunxi.c | 3 ++- drivers/pinctrl/vt8500/pinctrl-wmt.c | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-)drivers/pinctrl/pinctrl-coh901.c +2
-1@@ -830,7 +830,8 @@ static int __init u300_gpio_probe(struct platform_device *pdev)return 0 ; err_no_range: - err =gpiochip_remove (&gpio->chip); +if (gpiochip_remove (&gpio->chip)) +dev_err (&pdev->dev,"failed to remove gpio chip\n" ); err_no_chip: err_no_domain: err_no_port:drivers/pinctrl/pinctrl-sunxi.c +2
-1@@ -2000,7 +2000,8 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)return 0 ; gpiochip_error: - ret =gpiochip_remove (pctl->chip); +if (gpiochip_remove (pctl->chip)) +dev_err (&pdev->dev,"failed to remove gpio chip\n" ); pinctrl_error:pinctrl_unregister (pctl->pctl_dev);return ret;drivers/pinctrl/vt8500/pinctrl-wmt.c +0
-0
drivers/pinctrl/vt8500/pinctrl-wmt.c int wmt_pinctrl_probe(struct platform_device *pdev, · line 615
Quoted 9 lines
drivers/pinctrl/vt8500/pinctrl-wmt.c +1
-2@@ -609,8 +609,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev,return 0 ; fail_range: - err =gpiochip_remove (&data->gpio_chip); -if (err) +if (gpiochip_remove (&data->gpio_chip))dev_err (&pdev->dev,"failed to remove gpio chip\n" ); fail_gpio:pinctrl_unregister (data->pctl_dev);
Good catch.
for pinctrl-wmt
Regards
Tony P
Hi Axel,
Quoted 7 lines · Axel Lin
Otherwise, we return 0 in probe error paths when
gpiochip_remove()returns 0. Also show error message ifgpiochip_remove()fails.Signed-off-by Axel Lin <[email protected]>Cc Linus Walleij <[email protected]>Cc Maxime Ripard <[email protected]>Cc Tony Prisk <[email protected]>
For the sunxi part
Thanks!
Maxime
Signature · 3 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
Quoted 7 lines · Axel Lin
Otherwise, we return 0 in probe error paths when
gpiochip_remove()returns 0. Also show error message ifgpiochip_remove()fails.Signed-off-by Axel Lin <[email protected]>Cc Linus Walleij <[email protected]>Cc Maxime Ripard <[email protected]>Cc Tony Prisk <[email protected]>
Patch applied for fixes, with ACKs.
Yours,
Linus Walleij