Unverified Commit 130af75b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

ASoC: Switch back to struct platform_driver::remove() 



After commit 0edb555a ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all drivers below sound/soc to use .remove(), with the eventual
goal to drop struct platform_driver::remove_new(). As .remove() and
.remove_new() have the same prototypes, conversion is done by just
changing the structure member name in the driver initializer.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/20240909151230.909818-2-u.kleine-koenig@baylibre.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b09c71f3

sound/soc/adi/axi-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static struct platform_driver axi_i2s_driver = { 
		.of_match_table = axi_i2s_of_match,

	},

	.probe = axi_i2s_probe,

	.remove_new = axi_i2s_dev_remove,

	.remove = axi_i2s_dev_remove,

};

module_platform_driver(axi_i2s_driver);

sound/soc/adi/axi-spdif.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static struct platform_driver axi_spdif_driver = { 
		.of_match_table = axi_spdif_of_match,

	},

	.probe = axi_spdif_probe,

	.remove_new = axi_spdif_dev_remove,

	.remove = axi_spdif_dev_remove,

};

module_platform_driver(axi_spdif_driver);

sound/soc/amd/acp-pcm-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ static const struct dev_pm_ops acp_pm_ops = { 


static struct platform_driver acp_dma_driver = {

	.probe = acp_audio_probe,

	.remove_new = acp_audio_remove,

	.remove = acp_audio_remove,

	.driver = {

		.name = DRV_NAME,

		.pm = &acp_pm_ops,

sound/soc/amd/acp/acp-rembrandt.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static const struct dev_pm_ops rmb_dma_pm_ops = { 


static struct platform_driver rembrandt_driver = {

	.probe = rembrandt_audio_probe,

	.remove_new = rembrandt_audio_remove,

	.remove = rembrandt_audio_remove,

	.driver = {

		.name = "acp_asoc_rembrandt",

		.pm = &rmb_dma_pm_ops,

sound/soc/amd/acp/acp-renoir.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static const struct dev_pm_ops rn_dma_pm_ops = { 


static struct platform_driver renoir_driver = {

	.probe = renoir_audio_probe,

	.remove_new = renoir_audio_remove,

	.remove = renoir_audio_remove,

	.driver = {

		.name = "acp_asoc_renoir",

		.pm = &rn_dma_pm_ops,