aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorabdoulaye berthe <berthe.ab@gmail.com>2014-07-12 16:30:14 -0400
committerLinus Walleij <linus.walleij@linaro.org>2014-09-18 14:03:10 -0400
commit88d5e520aa9701eb3e4f46165e02097cc03d363a (patch)
tree443b8f89eeaf8933a9d3af2c9928cf0008aa35fd /drivers/input
parent2134cb997f2f1b2d960ad8705d67dc8d690ba59c (diff)
driver:gpio remove all usage of gpio_remove retval in driver
this remove all reference to gpio_remove retval in all driver except pinctrl and gpio. the same thing is done for gpio and pinctrl in two different patches. Signed-off-by: Abdoulaye Berthe <berthe.ab@gmail.com> Acked-by: Michael Büsch <m@bues.ch> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/adp5588-keys.c4
-rw-r--r--drivers/input/keyboard/adp5589-keys.c4
-rw-r--r--drivers/input/touchscreen/ad7879.c10
3 files changed, 5 insertions, 13 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 5ef7fcf0e250..b97ed443e0a4 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -251,9 +251,7 @@ static void adp5588_gpio_remove(struct adp5588_kpad *kpad)
251 dev_warn(dev, "teardown failed %d\n", error); 251 dev_warn(dev, "teardown failed %d\n", error);
252 } 252 }
253 253
254 error = gpiochip_remove(&kpad->gc); 254 gpiochip_remove(&kpad->gc);
255 if (error)
256 dev_warn(dev, "gpiochip_remove failed %d\n", error);
257} 255}
258#else 256#else
259static inline int adp5588_gpio_add(struct adp5588_kpad *kpad) 257static inline int adp5588_gpio_add(struct adp5588_kpad *kpad)
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index 6329549bf6ad..a45267729dfc 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -567,9 +567,7 @@ static void adp5589_gpio_remove(struct adp5589_kpad *kpad)
567 dev_warn(dev, "teardown failed %d\n", error); 567 dev_warn(dev, "teardown failed %d\n", error);
568 } 568 }
569 569
570 error = gpiochip_remove(&kpad->gc); 570 gpiochip_remove(&kpad->gc);
571 if (error)
572 dev_warn(dev, "gpiochip_remove failed %d\n", error);
573} 571}
574#else 572#else
575static inline int adp5589_gpio_add(struct adp5589_kpad *kpad) 573static inline int adp5589_gpio_add(struct adp5589_kpad *kpad)
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index fce590677b7b..1eb9d3c20886 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -470,14 +470,10 @@ static int ad7879_gpio_add(struct ad7879 *ts,
470static void ad7879_gpio_remove(struct ad7879 *ts) 470static void ad7879_gpio_remove(struct ad7879 *ts)
471{ 471{
472 const struct ad7879_platform_data *pdata = dev_get_platdata(ts->dev); 472 const struct ad7879_platform_data *pdata = dev_get_platdata(ts->dev);
473 int ret;
474 473
475 if (pdata->gpio_export) { 474 if (pdata->gpio_export)
476 ret = gpiochip_remove(&ts->gc); 475 gpiochip_remove(&ts->gc);
477 if (ret) 476
478 dev_err(ts->dev, "failed to remove gpio %d\n",
479 ts->gc.base);
480 }
481} 477}
482#else 478#else
483static inline int ad7879_gpio_add(struct ad7879 *ts, 479static inline int ad7879_gpio_add(struct ad7879 *ts,