[Sound-open-firmware] [PATCH 00/15] ASoC: Drop empty platform remove functions
From: Uwe Kleine-König uwe@kleine-koenig.org
Hello,
this patch series removes all platform remove functions that only return zero below sound/soc. There is no reason to have these, as the only caller is platform core code doing:
if (drv->remove) { int ret = drv->remove(dev);
... }
(in platform_remove()) and so having no remove function is both equivalent and simpler.
Best regards Uwe
Uwe Kleine-König (15): ASoC: pxa: Drop empty platform remove function ASoC: amd: Drop empty platform remove function ASoC: atmel-classd: Drop empty platform remove function ASoC: atmel-pdmic: Drop empty platform remove function ASoC: 88pm860x: Drop empty platform remove function ASoC: ac97: Drop empty platform remove function ASoC: adau7002: Drop empty platform remove function ASoC: bt-sco: Drop empty platform remove function ASoC: cq93vc: Drop empty platform remove function ASoC: mc13783: Drop empty platform remove function ASoC: wl1273: Drop empty platform remove function ASoC: pxa: e740_wm9705: Drop empty platform remove function ASoC: pxa: e750_wm9705: Drop empty platform remove function ASoC: pxa: e800_wm9712: Drop empty platform remove function ASoC: SOF: nocodec: Drop empty platform remove function
sound/soc/amd/raven/acp3x-i2s.c | 8 -------- sound/soc/atmel/atmel-classd.c | 6 ------ sound/soc/atmel/atmel-pdmic.c | 6 ------ sound/soc/codecs/88pm860x-codec.c | 6 ------ sound/soc/codecs/ac97.c | 6 ------ sound/soc/codecs/adau7002.c | 6 ------ sound/soc/codecs/bt-sco.c | 6 ------ sound/soc/codecs/cq93vc.c | 6 ------ sound/soc/codecs/mc13783.c | 6 ------ sound/soc/codecs/wl1273.c | 6 ------ sound/soc/pxa/e740_wm9705.c | 6 ------ sound/soc/pxa/e750_wm9705.c | 6 ------ sound/soc/pxa/e800_wm9712.c | 6 ------ sound/soc/pxa/spitz.c | 6 ------ sound/soc/sof/nocodec.c | 6 ------ 15 files changed, 92 deletions(-)
base-commit: 3a28c2c89f4b412b648761430720d40a8dc326ef
A remove callback just returning 0 is equivalent to no remove callback at all. So drop the useless function.
Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de --- sound/soc/sof/nocodec.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c index 3537805070ad..b13bfdeb2b70 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -103,14 +103,8 @@ static int sof_nocodec_probe(struct platform_device *pdev) return devm_snd_soc_register_card(&pdev->dev, card); }
-static int sof_nocodec_remove(struct platform_device *pdev) -{ - return 0; -} - static struct platform_driver sof_nocodec_audio = { .probe = sof_nocodec_probe, - .remove = sof_nocodec_remove, .driver = { .name = "sof-nocodec", .pm = &snd_soc_pm_ops,
On 12/12/22 14:54, Uwe Kleine-König wrote:
A remove callback just returning 0 is equivalent to no remove callback at all. So drop the useless function.
Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de
Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
sound/soc/sof/nocodec.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c index 3537805070ad..b13bfdeb2b70 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -103,14 +103,8 @@ static int sof_nocodec_probe(struct platform_device *pdev) return devm_snd_soc_register_card(&pdev->dev, card); }
-static int sof_nocodec_remove(struct platform_device *pdev) -{
- return 0;
-}
static struct platform_driver sof_nocodec_audio = { .probe = sof_nocodec_probe,
- .remove = sof_nocodec_remove, .driver = { .name = "sof-nocodec", .pm = &snd_soc_pm_ops,
On Mon, 12 Dec 2022 21:53:51 +0100, Uwe Kleine-König wrote:
this patch series removes all platform remove functions that only return zero below sound/soc. There is no reason to have these, as the only caller is platform core code doing:
if (drv->remove) { int ret = drv->remove(dev);[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/15] ASoC: pxa: Drop empty platform remove function commit: e812aa458acf7c47f9f5d8e6c62177317a998263 [02/15] ASoC: amd: Drop empty platform remove function commit: 001c6df098834eb5eaa36a2b121bd6a675b38aa9 [03/15] ASoC: atmel-classd: Drop empty platform remove function commit: 9d5664fdf6a89e66f806763d76f18337ab3cb18a [04/15] ASoC: atmel-pdmic: Drop empty platform remove function commit: edf2ceb9a2a279d350fdb57c1930554c8675b2b1 [05/15] ASoC: 88pm860x: Drop empty platform remove function commit: 9fbfe1d1acf596b5ba9ddbb145c7be6a09b2f1eb [06/15] ASoC: ac97: Drop empty platform remove function commit: 7de12b06eeb2fbe3732e96ae40e38159700f61ec [07/15] ASoC: adau7002: Drop empty platform remove function commit: 06e8ce87356e7751ffea831396f8b3129a805d28 [08/15] ASoC: bt-sco: Drop empty platform remove function commit: f9cc66890fb8d695e38486595851701dbfa22487 [09/15] ASoC: cq93vc: Drop empty platform remove function commit: 61f62f1fcf7e4a3cb347d2d4c9696dd725c922f0 [10/15] ASoC: mc13783: Drop empty platform remove function commit: 140212aefce754f230a28751415c71705f7e3ffa [11/15] ASoC: wl1273: Drop empty platform remove function commit: d09751b3523eb0d6bea345bda99b2f5417feb2ff [12/15] ASoC: pxa: e740_wm9705: Drop empty platform remove function commit: f2211ac36ab0b175cca7a244560923fbeeb6c7ae [13/15] ASoC: pxa: e750_wm9705: Drop empty platform remove function commit: 4ed923e8076b8728c1c1cf587b79a83e34de22b0 [14/15] ASoC: pxa: e800_wm9712: Drop empty platform remove function commit: 394296eee2c220283ebc835db61ba4531f865558 [15/15] ASoC: SOF: nocodec: Drop empty platform remove function commit: 603d96c917b2e8c2146069bf7db1468fd87f800b
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
participants (3)
-
Mark Brown -
Pierre-Louis Bossart -
Uwe Kleine-König