summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2020-11-19 17:16:04 +0100
committerMark Brown <broonie@kernel.org>2020-11-20 13:49:12 +0000
commit7795d4757502d8615bf092d628d424300bb31e5f (patch)
treee1e07b7bb72bc92534873b75c0ca2a49ae902f3b
parent9db34ee64ce492c7ede3555ed690c8253d9935e4 (diff)
downloadlinux-7795d4757502d8615bf092d628d424300bb31e5f.tar.bz2
spi: Warn when a driver's remove callback returns an error
The driver core ignores the return value of struct device_driver::remove (because in general there is nothing that can be done about that). So add a warning when an spi driver returns an error. This simplifies the quest to make struct device_driver::remove return void. A consequent change would be to make struct spi_driver::remove return void, but I'm keeping this quest for later (or someone else). Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20201119161604.2633521-3-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 3aeb54a425a9..6ee0f66ddef1 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -408,13 +408,20 @@ static int spi_probe(struct device *dev)
static int spi_remove(struct device *dev)
{
const struct spi_driver *sdrv = to_spi_driver(dev->driver);
- int ret = 0;
- if (sdrv->remove)
+ if (sdrv->remove) {
+ int ret;
+
ret = sdrv->remove(to_spi_device(dev));
+ if (ret)
+ dev_warn(dev,
+ "Failed to unbind driver (%pe), ignoring\n",
+ ERR_PTR(ret));
+ }
+
dev_pm_domain_detach(dev, true);
- return ret;
+ return 0;
}
static void spi_shutdown(struct device *dev)