From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Lee Jones <lee.jones@linaro.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Mark Brown <broonie@kernel.org>,
linux-spi@vger.kernel.org, kernel@pengutronix.de,
linux-stm32@st-md-mailman.stormreply.com,
linux-kernel@vger.kernel.org, Wolfram Sang <wsa@kernel.org>,
linux-i2c@vger.kernel.org
Subject: [PATCH 08/13] mfd: stmpe: Make stmpe_remove() return void
Date: Mon, 11 Oct 2021 15:27:49 +0200 [thread overview]
Message-ID: <20211011132754.2479853-9-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20211011132754.2479853-1-u.kleine-koenig@pengutronix.de>
Up to now stmpe_remove() 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/stmpe-i2c.c | 4 +++-
drivers/mfd/stmpe-spi.c | 4 +++-
drivers/mfd/stmpe.c | 4 +---
drivers/mfd/stmpe.h | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index cd2f45257dc1..d3eedf3d607e 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -95,7 +95,9 @@ static int stmpe_i2c_remove(struct i2c_client *i2c)
{
struct stmpe *stmpe = dev_get_drvdata(&i2c->dev);
- return stmpe_remove(stmpe);
+ stmpe_remove(stmpe);
+
+ return 0;
}
static const struct i2c_device_id stmpe_i2c_id[] = {
diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index 7351734f7593..6c5915016be5 100644
--- a/drivers/mfd/stmpe-spi.c
+++ b/drivers/mfd/stmpe-spi.c
@@ -106,7 +106,9 @@ static int stmpe_spi_remove(struct spi_device *spi)
{
struct stmpe *stmpe = spi_get_drvdata(spi);
- return stmpe_remove(stmpe);
+ stmpe_remove(stmpe);
+
+ return 0;
}
static const struct of_device_id stmpe_spi_of_match[] = {
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 58d09c615e67..e928df95e316 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1496,7 +1496,7 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)
return ret;
}
-int stmpe_remove(struct stmpe *stmpe)
+void stmpe_remove(struct stmpe *stmpe)
{
if (!IS_ERR(stmpe->vio))
regulator_disable(stmpe->vio);
@@ -1506,8 +1506,6 @@ int stmpe_remove(struct stmpe *stmpe)
__stmpe_disable(stmpe, STMPE_BLOCK_ADC);
mfd_remove_devices(stmpe->dev);
-
- return 0;
}
#ifdef CONFIG_PM
diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h
index 83491e99ba3c..1b4f91d03bbf 100644
--- a/drivers/mfd/stmpe.h
+++ b/drivers/mfd/stmpe.h
@@ -98,7 +98,7 @@ struct stmpe_client_info {
};
int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum);
-int stmpe_remove(struct stmpe *stmpe);
+void stmpe_remove(struct stmpe *stmpe);
#define STMPE_ICR_LSB_HIGH (1 << 2)
#define STMPE_ICR_LSB_EDGE (1 << 1)
--
2.30.2
next prev parent reply other threads:[~2021-10-11 13:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 13:27 [PATCH 00/13] Make some spi device drivers return zero in .remove() Uwe Kleine-König
2021-10-11 13:27 ` [PATCH 01/13] drm/panel: s6e63m0: Make s6e63m0_remove() return void Uwe Kleine-König
2021-10-11 16:51 ` Sam Ravnborg
2021-10-11 13:27 ` [PATCH 02/13] hwmon: adt7x10: Make adt7x10_remove() " Uwe Kleine-König
2021-10-11 14:19 ` Guenter Roeck
2021-10-11 13:27 ` [PATCH 03/13] hwmon: max31722: Warn about failure to put device in stand-by in .remove() Uwe Kleine-König
2021-10-11 13:41 ` Hennerich, Michael
2021-10-11 13:27 ` [PATCH 04/13] input: adxl34xx: Make adxl34x_remove() return void Uwe Kleine-König
2021-10-11 13:27 ` [PATCH 05/13] input: touchscreen: tsc200x: Make tsc200x_remove() " Uwe Kleine-König
2021-10-11 13:27 ` [PATCH 06/13] media: cxd2880: Eliminate dead code Uwe Kleine-König
2021-10-11 13:27 ` [PATCH 07/13] mfd: mc13xxx: Make mc13xxx_common_exit() return void Uwe Kleine-König
2021-10-11 13:27 ` Uwe Kleine-König [this message]
2021-10-11 13:27 ` [PATCH 09/13] mfd: tps65912: Make tps65912_device_exit() " Uwe Kleine-König
2021-10-11 13:27 ` [PATCH 10/13] serial: max310x: Make max310x_remove() " Uwe Kleine-König
2021-10-11 13:51 ` Greg Kroah-Hartman
2021-10-11 13:27 ` [PATCH 11/13] serial: sc16is7xx: Make sc16is7xx_remove() " Uwe Kleine-König
2021-10-11 13:27 ` [PATCH 12/13] staging: fbtft: Make fbtft_remove_common() " Uwe Kleine-König
2021-10-11 13:27 ` [PATCH 13/13] tpm: st33zp24: Make st33zp24_remove() " Uwe Kleine-König
2021-10-12 16:47 ` Jarkko Sakkinen
2021-10-12 17:40 ` Uwe Kleine-König
2021-10-12 17:46 ` Jarkko Sakkinen
2021-10-11 20:42 ` [PATCH 00/13] Make some spi device drivers return zero in .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=20211011132754.2479853-9-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=alexandre.torgue@foss.st.com \
--cc=broonie@kernel.org \
--cc=kernel@pengutronix.de \
--cc=lee.jones@linaro.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=wsa@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.