linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Lee Jones <lee.jones@linaro.org>
Cc: Mark Brown <broonie@kernel.org>,
	kernel@pengutronix.de, linux-kernel@vger.kernel.org,
	linux-spi@vger.kernel.org
Subject: [PATCH v2 08/20] mfd: mc13xxx: Make mc13xxx_common_exit() return void
Date: Tue, 12 Oct 2021 17:39:33 +0200	[thread overview]
Message-ID: <20211012153945.2651412-9-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20211012153945.2651412-1-u.kleine-koenig@pengutronix.de>

Up to now mc13xxx_common_exit() returns zero unconditionally. Make it
return void instead which makes it easier to see in the callers that
there is no error to handle.

Also the return value of i2c and spi remove callbacks is ignored anyway.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/mfd/mc13xxx-core.c | 4 +---
 drivers/mfd/mc13xxx-i2c.c  | 3 ++-
 drivers/mfd/mc13xxx-spi.c  | 3 ++-
 drivers/mfd/mc13xxx.h      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 1abe7432aad8..8a4f1d90dcfd 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -496,15 +496,13 @@ int mc13xxx_common_init(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(mc13xxx_common_init);
 
-int mc13xxx_common_exit(struct device *dev)
+void mc13xxx_common_exit(struct device *dev)
 {
 	struct mc13xxx *mc13xxx = dev_get_drvdata(dev);
 
 	mfd_remove_devices(dev);
 	regmap_del_irq_chip(mc13xxx->irq, mc13xxx->irq_data);
 	mutex_destroy(&mc13xxx->lock);
-
-	return 0;
 }
 EXPORT_SYMBOL_GPL(mc13xxx_common_exit);
 
diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
index 65b4dd8e5afb..fb937f66277e 100644
--- a/drivers/mfd/mc13xxx-i2c.c
+++ b/drivers/mfd/mc13xxx-i2c.c
@@ -87,7 +87,8 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
 
 static int mc13xxx_i2c_remove(struct i2c_client *client)
 {
-	return mc13xxx_common_exit(&client->dev);
+	mc13xxx_common_exit(&client->dev);
+	return 0;
 }
 
 static struct i2c_driver mc13xxx_i2c_driver = {
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index 286ddcf5ddc6..4d8913d647e6 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -168,7 +168,8 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
 
 static int mc13xxx_spi_remove(struct spi_device *spi)
 {
-	return mc13xxx_common_exit(&spi->dev);
+	mc13xxx_common_exit(&spi->dev);
+	return 0;
 }
 
 static struct spi_driver mc13xxx_spi_driver = {
diff --git a/drivers/mfd/mc13xxx.h b/drivers/mfd/mc13xxx.h
index ce6eec52e8eb..bd5ba9a0e14f 100644
--- a/drivers/mfd/mc13xxx.h
+++ b/drivers/mfd/mc13xxx.h
@@ -44,6 +44,6 @@ struct mc13xxx {
 };
 
 int mc13xxx_common_init(struct device *dev);
-int mc13xxx_common_exit(struct device *dev);
+void mc13xxx_common_exit(struct device *dev);
 
 #endif /* __DRIVERS_MFD_MC13XXX_H */
-- 
2.30.2


  parent reply	other threads:[~2021-10-12 15:40 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-12 15:39 [PATCH v2 00/20] Make some spi device drivers return zero in .remove() Uwe Kleine-König
2021-10-12 15:39 ` [PATCH v2 01/20] drm/panel: s6e63m0: Make s6e63m0_remove() return void Uwe Kleine-König
2021-10-12 15:39 ` [PATCH v2 02/20] gpio: max730x: Make __max730x_remove() " Uwe Kleine-König
2021-10-13 17:53   ` Bartosz Golaszewski
2021-10-12 15:39 ` [PATCH v2 03/20] gpio: mc33880: Drop if with an always false condition Uwe Kleine-König
2021-10-13 17:53   ` Bartosz Golaszewski
2021-10-12 15:39 ` [PATCH v2 04/20] hwmon: max31722: Warn about failure to put device in stand-by in .remove() Uwe Kleine-König
2021-10-12 15:51   ` Guenter Roeck
2021-10-12 15:39 ` [PATCH v2 05/20] input: adxl34xx: Make adxl34x_remove() return void Uwe Kleine-König
2021-10-13  2:45   ` Dmitry Torokhov
2021-10-13  7:49   ` Hennerich, Michael
2021-10-12 15:39 ` [PATCH v2 06/20] input: touchscreen: tsc200x: Make tsc200x_remove() " Uwe Kleine-König
2021-10-13  2:45   ` Dmitry Torokhov
2021-10-12 15:39 ` [PATCH v2 07/20] media: cxd2880: Eliminate dead code Uwe Kleine-König
2021-10-12 15:39 ` Uwe Kleine-König [this message]
2021-10-21 10:18   ` [PATCH v2 08/20] mfd: mc13xxx: Make mc13xxx_common_exit() return void Lee Jones
2021-10-12 15:39 ` [PATCH v2 09/20] mfd: stmpe: Make stmpe_remove() " Uwe Kleine-König
2021-10-21 10:19   ` Lee Jones
2021-10-12 15:39 ` [PATCH v2 10/20] mfd: tps65912: Make tps65912_device_exit() " Uwe Kleine-König
2021-10-21 10:19   ` Lee Jones
2021-10-12 15:39 ` [PATCH v2 11/20] misc: ad525x_dpot: Make ad_dpot_remove() " Uwe Kleine-König
2021-10-13  7:49   ` Hennerich, Michael
2021-10-12 15:39 ` [PATCH v2 12/20] misc: lis3lv02d: Make lis3lv02d_remove_fs() " Uwe Kleine-König
2021-10-12 15:54   ` Hans de Goede
2021-10-13  9:01     ` Greg Kroah-Hartman
2021-10-12 15:39 ` [PATCH v2 13/20] mtd: dataflash: Warn about failure to unregister mtd device Uwe Kleine-König
2021-10-13 12:44   ` Miquel Raynal
2021-10-13 14:08     ` Uwe Kleine-König
2021-10-13 14:33       ` Miquel Raynal
2021-10-13 15:13         ` Mark Brown
2021-10-12 15:39 ` [PATCH v2 14/20] mtd: mchp23k256: " Uwe Kleine-König
2021-10-12 15:39 ` [PATCH v2 15/20] mtd: mchp48l640: " Uwe Kleine-König
2021-10-12 15:39 ` [PATCH v2 16/20] mtd: sst25l: " Uwe Kleine-König
2021-10-12 15:39 ` [PATCH v2 17/20] serial: max310x: Make max310x_remove() return void Uwe Kleine-König
2021-10-12 15:39 ` [PATCH v2 18/20] serial: sc16is7xx: Make sc16is7xx_remove() " Uwe Kleine-König
2021-10-12 15:39 ` [PATCH v2 19/20] staging: fbtft: Make fbtft_remove_common() " Uwe Kleine-König
2021-10-12 18:41   ` Andy Shevchenko
2021-10-12 15:39 ` [PATCH v2 20/20] tpm: st33zp24: Make st33zp24_remove() " Uwe Kleine-König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211012153945.2651412-9-u.kleine-koenig@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=broonie@kernel.org \
    --cc=kernel@pengutronix.de \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).