diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2021-10-12 17:39:32 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-12-07 11:29:57 +0100 |
| commit | 61b738e938ef091e0c4c4e8eadeaf27502732e97 (patch) | |
| tree | e5a7119a16dc485badb30afe70926c310fcdfee8 /drivers/media/spi | |
| parent | 48f45c2a969b5a012fda468350706c3a479f0707 (diff) | |
| download | linux-stable-61b738e938ef091e0c4c4e8eadeaf27502732e97.tar.gz linux-stable-61b738e938ef091e0c4c4e8eadeaf27502732e97.tar.bz2 linux-stable-61b738e938ef091e0c4c4e8eadeaf27502732e97.zip | |
media: cxd2880: Eliminate dead code
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.
Link: https://lore.kernel.org/linux-media/20211012153945.2651412-8-u.kleine-koenig@pengutronix.de
Cc: Mark Brown <broonie@kernel.org>, kernel@pengutronix.de, linux-media@vger.kernel.org, linux-spi@vger.kernel.org
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/spi')
| -rw-r--r-- | drivers/media/spi/cxd2880-spi.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c index 506f52c1af10..6f2a66bc87fb 100644 --- a/drivers/media/spi/cxd2880-spi.c +++ b/drivers/media/spi/cxd2880-spi.c @@ -628,19 +628,8 @@ fail_regulator: 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); |