diff options
author | Emil Goode <emilgoode@gmail.com> | 2012-08-18 18:12:48 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-05 12:33:40 -0700 |
commit | 23e7c6a765df64cafebff2d50fc51345797ca99a (patch) | |
tree | 74e01f0e6225d3a5193cbd3b665b0ffeeec364a5 | |
parent | 1a16afa2cecd36bc4b6ba00fe4c83fcf5ca6e710 (diff) |
tty: serial: max310x: Check return code of gpiochip_remove
The gpiochip_remove function may fail to remove a gpio_chip
if any GPIOs are still requested. This patch informs the caller
of such a senario.
Sparse is warning because the function prototype has a
__must_check annotation.
Sparse warning:
drivers/tty/serial/max310x.c:1223:18: warning:
ignoring return value of ‘gpiochip_remove’,
declared with attribute warn_unused_result
[-Wunused-result]
Signed-off-by: Emil Goode <emilgoode@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/max310x.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 534e44851b7..06ff5ad7563 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -1207,6 +1207,7 @@ static int __devexit max310x_remove(struct spi_device *spi) { struct device *dev = &spi->dev; struct max310x_port *s = dev_get_drvdata(dev); + int ret = 0; dev_dbg(dev, "Removing port\n"); @@ -1219,8 +1220,11 @@ static int __devexit max310x_remove(struct spi_device *spi) uart_unregister_driver(&s->uart); #ifdef CONFIG_GPIOLIB - if (s->pdata->gpio_base) - gpiochip_remove(&s->gpio); + if (s->pdata->gpio_base) { + ret = gpiochip_remove(&s->gpio); + if (ret) + dev_err(dev, "Failed to remove gpio chip: %d\n", ret); + } #endif dev_set_drvdata(dev, NULL); @@ -1232,7 +1236,7 @@ static int __devexit max310x_remove(struct spi_device *spi) devm_kfree(dev, s); - return 0; + return ret; } static const struct spi_device_id max310x_id_table[] = { |