From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Mark Brown <broonie@kernel.org>,
linux-spi@vger.kernel.org, kernel@pengutronix.de,
linux-input@vger.kernel.org, Wolfram Sang <wsa@kernel.org>,
linux-i2c@vger.kernel.org
Subject: [PATCH 05/13] input: touchscreen: tsc200x: Make tsc200x_remove() return void
Date: Mon, 11 Oct 2021 15:27:46 +0200 [thread overview]
Message-ID: <20211011132754.2479853-6-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20211011132754.2479853-1-u.kleine-koenig@pengutronix.de>
Up to now tsc200x_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/input/touchscreen/tsc2004.c | 4 +++-
drivers/input/touchscreen/tsc2005.c | 4 +++-
drivers/input/touchscreen/tsc200x-core.c | 4 +---
drivers/input/touchscreen/tsc200x-core.h | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/input/touchscreen/tsc2004.c b/drivers/input/touchscreen/tsc2004.c
index 0272cedcc726..9fdd870c4c0b 100644
--- a/drivers/input/touchscreen/tsc2004.c
+++ b/drivers/input/touchscreen/tsc2004.c
@@ -45,7 +45,9 @@ static int tsc2004_probe(struct i2c_client *i2c,
static int tsc2004_remove(struct i2c_client *i2c)
{
- return tsc200x_remove(&i2c->dev);
+ tsc200x_remove(&i2c->dev);
+
+ return 0;
}
static const struct i2c_device_id tsc2004_idtable[] = {
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 923496bbb368..edaa4afbaab4 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -66,7 +66,9 @@ static int tsc2005_probe(struct spi_device *spi)
static int tsc2005_remove(struct spi_device *spi)
{
- return tsc200x_remove(&spi->dev);
+ tsc200x_remove(&spi->dev);
+
+ return 0
}
#ifdef CONFIG_OF
diff --git a/drivers/input/touchscreen/tsc200x-core.c b/drivers/input/touchscreen/tsc200x-core.c
index b8d720d52013..27810f6c69f6 100644
--- a/drivers/input/touchscreen/tsc200x-core.c
+++ b/drivers/input/touchscreen/tsc200x-core.c
@@ -577,15 +577,13 @@ int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
}
EXPORT_SYMBOL_GPL(tsc200x_probe);
-int tsc200x_remove(struct device *dev)
+void tsc200x_remove(struct device *dev)
{
struct tsc200x *ts = dev_get_drvdata(dev);
sysfs_remove_group(&dev->kobj, &tsc200x_attr_group);
regulator_disable(ts->vio);
-
- return 0;
}
EXPORT_SYMBOL_GPL(tsc200x_remove);
diff --git a/drivers/input/touchscreen/tsc200x-core.h b/drivers/input/touchscreen/tsc200x-core.h
index a43c08ccfd3d..4ded34425b21 100644
--- a/drivers/input/touchscreen/tsc200x-core.h
+++ b/drivers/input/touchscreen/tsc200x-core.h
@@ -74,6 +74,6 @@ extern const struct dev_pm_ops tsc200x_pm_ops;
int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
struct regmap *regmap,
int (*tsc200x_cmd)(struct device *dev, u8 cmd));
-int tsc200x_remove(struct device *dev);
+void tsc200x_remove(struct device *dev);
#endif
--
2.30.2
next prev parent reply other threads:[~2021-10-11 13:28 UTC|newest]
Thread overview: 21+ 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 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 ` Uwe Kleine-König [this message]
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 ` [PATCH 08/13] mfd: stmpe: Make stmpe_remove() " Uwe Kleine-König
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-6-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=broonie@kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--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 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).