diff options
author | abdoulaye berthe <berthe.ab@gmail.com> | 2014-07-12 16:30:14 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-18 14:03:10 -0400 |
commit | 88d5e520aa9701eb3e4f46165e02097cc03d363a (patch) | |
tree | 443b8f89eeaf8933a9d3af2c9928cf0008aa35fd /drivers/tty | |
parent | 2134cb997f2f1b2d960ad8705d67dc8d690ba59c (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/tty')
-rw-r--r-- | drivers/tty/serial/max310x.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 82573dc4d8cf..0041a64cc86e 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c | |||
@@ -1248,7 +1248,7 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype, | |||
1248 | mutex_destroy(&s->mutex); | 1248 | mutex_destroy(&s->mutex); |
1249 | 1249 | ||
1250 | #ifdef CONFIG_GPIOLIB | 1250 | #ifdef CONFIG_GPIOLIB |
1251 | WARN_ON(gpiochip_remove(&s->gpio)); | 1251 | gpiochip_remove(&s->gpio); |
1252 | 1252 | ||
1253 | out_uart: | 1253 | out_uart: |
1254 | #endif | 1254 | #endif |
@@ -1263,12 +1263,10 @@ out_clk: | |||
1263 | static int max310x_remove(struct device *dev) | 1263 | static int max310x_remove(struct device *dev) |
1264 | { | 1264 | { |
1265 | struct max310x_port *s = dev_get_drvdata(dev); | 1265 | struct max310x_port *s = dev_get_drvdata(dev); |
1266 | int i, ret = 0; | 1266 | int i; |
1267 | 1267 | ||
1268 | #ifdef CONFIG_GPIOLIB | 1268 | #ifdef CONFIG_GPIOLIB |
1269 | ret = gpiochip_remove(&s->gpio); | 1269 | gpiochip_remove(&s->gpio); |
1270 | if (ret) | ||
1271 | return ret; | ||
1272 | #endif | 1270 | #endif |
1273 | 1271 | ||
1274 | for (i = 0; i < s->uart.nr; i++) { | 1272 | for (i = 0; i < s->uart.nr; i++) { |
@@ -1282,7 +1280,7 @@ static int max310x_remove(struct device *dev) | |||
1282 | uart_unregister_driver(&s->uart); | 1280 | uart_unregister_driver(&s->uart); |
1283 | clk_disable_unprepare(s->clk); | 1281 | clk_disable_unprepare(s->clk); |
1284 | 1282 | ||
1285 | return ret; | 1283 | return 0; |
1286 | } | 1284 | } |
1287 | 1285 | ||
1288 | static const struct of_device_id __maybe_unused max310x_dt_ids[] = { | 1286 | static const struct of_device_id __maybe_unused max310x_dt_ids[] = { |