projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/fsl-easi', 'asoc/topic/fsl-sai', 'asoc...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
gpio-viperboard.c
diff --git
a/drivers/gpio/gpio-viperboard.c
b/drivers/gpio/gpio-viperboard.c
index 79e3b5836712b1fbbbff1c638751fa761ce3a480..e2a11f27807fcd0b23b7c0ecfc11d5690466edfa 100644
(file)
--- a/
drivers/gpio/gpio-viperboard.c
+++ b/
drivers/gpio/gpio-viperboard.c
@@
-446,8
+446,7
@@
static int vprbrd_gpio_probe(struct platform_device *pdev)
return ret;
err_gpiob:
return ret;
err_gpiob:
- if (gpiochip_remove(&vb_gpio->gpioa))
- dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__);
+ gpiochip_remove(&vb_gpio->gpioa);
err_gpioa:
return ret;
err_gpioa:
return ret;
@@
-456,13
+455,10
@@
err_gpioa:
static int vprbrd_gpio_remove(struct platform_device *pdev)
{
struct vprbrd_gpio *vb_gpio = platform_get_drvdata(pdev);
static int vprbrd_gpio_remove(struct platform_device *pdev)
{
struct vprbrd_gpio *vb_gpio = platform_get_drvdata(pdev);
- int ret;
- ret = gpiochip_remove(&vb_gpio->gpiob);
- if (ret == 0)
- ret = gpiochip_remove(&vb_gpio->gpioa);
+ gpiochip_remove(&vb_gpio->gpiob);
- return
ret
;
+ return
0
;
}
static struct platform_driver vprbrd_gpio_driver = {
}
static struct platform_driver vprbrd_gpio_driver = {