From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Yasunari Takiguchi <Yasunari.Takiguchi@sony.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Mark Brown <broonie@kernel.org>,
linux-spi@vger.kernel.org, kernel@pengutronix.de,
linux-media@vger.kernel.org
Subject: [PATCH 06/13] media: cxd2880: Eliminate dead code
Date: Mon, 11 Oct 2021 15:27:47 +0200 [thread overview]
Message-ID: <20211011132754.2479853-7-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20211011132754.2479853-1-u.kleine-koenig@pengutronix.de>
An spi remove callback is never called with an spi_device pointer that
is NULL. Also it is only called for devices that probed successfully. As
cxd2880_spi_probe() always sets driver data, spi_get_drvdata() cannot be
NULL.
Also the return value of spi remove callbacks is ignored anyway and not
freeing resources in .remove() is a bad idea.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/media/spi/cxd2880-spi.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c
index b91a1e845b97..67cacf29a61e 100644
--- a/drivers/media/spi/cxd2880-spi.c
+++ b/drivers/media/spi/cxd2880-spi.c
@@ -628,19 +628,8 @@ cxd2880_spi_probe(struct spi_device *spi)
static int
cxd2880_spi_remove(struct spi_device *spi)
{
- struct cxd2880_dvb_spi *dvb_spi;
+ struct cxd2880_dvb_spi *dvb_spi = spi_get_drvdata(spi);
- if (!spi) {
- pr_err("invalid arg\n");
- return -EINVAL;
- }
-
- dvb_spi = spi_get_drvdata(spi);
-
- if (!dvb_spi) {
- pr_err("failed\n");
- return -EINVAL;
- }
dvb_spi->demux.dmx.remove_frontend(&dvb_spi->demux.dmx,
&dvb_spi->dmx_fe);
dvb_dmxdev_release(&dvb_spi->dmxdev);
--
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 ` [PATCH 05/13] input: touchscreen: tsc200x: Make tsc200x_remove() " Uwe Kleine-König
2021-10-11 13:27 ` Uwe Kleine-König [this message]
2021-10-11 13:27 ` [PATCH 07/13] mfd: mc13xxx: Make mc13xxx_common_exit() " 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-7-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=Yasunari.Takiguchi@sony.com \
--cc=broonie@kernel.org \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mchehab@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).