| Message ID | 20211020125803.23117-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8b27cb2e6dd67552f19f45b4560bdedce1ffb638 |
| Headers | show |
| Series | ASoc: wm8731: Drop empty spi_driver remove callback | expand |
On Wed, Oct 20, 2021 at 02:58:03PM +0200, Uwe Kleine-König wrote: > A driver with a remove callback that just returns 0 behaves identically > to a driver with no remove callback at all. So simplify accordingly. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
On Wed, 20 Oct 2021 14:58:03 +0200, Uwe Kleine-König wrote: > A driver with a remove callback that just returns 0 behaves identically > to a driver with no remove callback at all. So simplify accordingly. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoc: wm8731: Drop empty spi_driver remove callback commit: 8b27cb2e6dd67552f19f45b4560bdedce1ffb638 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index dcee7b2bd3d7..86b1f6eaa599 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -713,18 +713,12 @@ static int wm8731_spi_probe(struct spi_device *spi) return 0; } -static int wm8731_spi_remove(struct spi_device *spi) -{ - return 0; -} - static struct spi_driver wm8731_spi_driver = { .driver = { .name = "wm8731", .of_match_table = wm8731_of_match, }, .probe = wm8731_spi_probe, - .remove = wm8731_spi_remove, }; #endif /* CONFIG_SPI_MASTER */
A driver with a remove callback that just returns 0 behaves identically to a driver with no remove callback at all. So simplify accordingly. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- sound/soc/codecs/wm8731.c | 6 ------ 1 file changed, 6 deletions(-)