Commit 23e7c6a7 authored by Emil Goode's avatar Emil Goode Committed by Greg Kroah-Hartman

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: default avatarEmil Goode <emilgoode@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a16afa2
...@@ -1207,6 +1207,7 @@ static int __devexit max310x_remove(struct spi_device *spi) ...@@ -1207,6 +1207,7 @@ static int __devexit max310x_remove(struct spi_device *spi)
{ {
struct device *dev = &spi->dev; struct device *dev = &spi->dev;
struct max310x_port *s = dev_get_drvdata(dev); struct max310x_port *s = dev_get_drvdata(dev);
int ret = 0;
dev_dbg(dev, "Removing port\n"); dev_dbg(dev, "Removing port\n");
...@@ -1219,8 +1220,11 @@ static int __devexit max310x_remove(struct spi_device *spi) ...@@ -1219,8 +1220,11 @@ static int __devexit max310x_remove(struct spi_device *spi)
uart_unregister_driver(&s->uart); uart_unregister_driver(&s->uart);
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
if (s->pdata->gpio_base) if (s->pdata->gpio_base) {
gpiochip_remove(&s->gpio); ret = gpiochip_remove(&s->gpio);
if (ret)
dev_err(dev, "Failed to remove gpio chip: %d\n", ret);
}
#endif #endif
dev_set_drvdata(dev, NULL); dev_set_drvdata(dev, NULL);
...@@ -1232,7 +1236,7 @@ static int __devexit max310x_remove(struct spi_device *spi) ...@@ -1232,7 +1236,7 @@ static int __devexit max310x_remove(struct spi_device *spi)
devm_kfree(dev, s); devm_kfree(dev, s);
return 0; return ret;
} }
static const struct spi_device_id max310x_id_table[] = { static const struct spi_device_id max310x_id_table[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment