Skip to content

Commit 130af75

Browse files
ukleinekbroonie
authored andcommitted
ASoC: Switch back to struct platform_driver::remove()
After commit 0edb555 ("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: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Link: https://patch.msgid.link/20240909151230.909818-2-u.kleine-koenig@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent b09c71f commit 130af75

184 files changed

Lines changed: 184 additions & 184 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

sound/soc/adi/axi-i2s.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static struct platform_driver axi_i2s_driver = {
293293
.of_match_table = axi_i2s_of_match,
294294
},
295295
.probe = axi_i2s_probe,
296-
.remove_new = axi_i2s_dev_remove,
296+
.remove = axi_i2s_dev_remove,
297297
};
298298
module_platform_driver(axi_i2s_driver);
299299

sound/soc/adi/axi-spdif.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ static struct platform_driver axi_spdif_driver = {
258258
.of_match_table = axi_spdif_of_match,
259259
},
260260
.probe = axi_spdif_probe,
261-
.remove_new = axi_spdif_dev_remove,
261+
.remove = axi_spdif_dev_remove,
262262
};
263263
module_platform_driver(axi_spdif_driver);
264264

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,7 @@ static const struct dev_pm_ops acp_pm_ops = {
14261426

14271427
static struct platform_driver acp_dma_driver = {
14281428
.probe = acp_audio_probe,
1429-
.remove_new = acp_audio_remove,
1429+
.remove = acp_audio_remove,
14301430
.driver = {
14311431
.name = DRV_NAME,
14321432
.pm = &acp_pm_ops,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static const struct dev_pm_ops rmb_dma_pm_ops = {
295295

296296
static struct platform_driver rembrandt_driver = {
297297
.probe = rembrandt_audio_probe,
298-
.remove_new = rembrandt_audio_remove,
298+
.remove = rembrandt_audio_remove,
299299
.driver = {
300300
.name = "acp_asoc_rembrandt",
301301
.pm = &rmb_dma_pm_ops,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static const struct dev_pm_ops rn_dma_pm_ops = {
244244

245245
static struct platform_driver renoir_driver = {
246246
.probe = renoir_audio_probe,
247-
.remove_new = renoir_audio_remove,
247+
.remove = renoir_audio_remove,
248248
.driver = {
249249
.name = "acp_asoc_renoir",
250250
.pm = &rn_dma_pm_ops,

sound/soc/amd/acp/acp-sdw-sof-mach.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ static struct platform_driver sof_sdw_driver = {
729729
.pm = &snd_soc_pm_ops,
730730
},
731731
.probe = mc_probe,
732-
.remove_new = mc_remove,
732+
.remove = mc_remove,
733733
.id_table = mc_id_table,
734734
};
735735

sound/soc/amd/acp/acp63.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ static const struct dev_pm_ops acp63_dma_pm_ops = {
304304

305305
static struct platform_driver acp63_driver = {
306306
.probe = acp63_audio_probe,
307-
.remove_new = acp63_audio_remove,
307+
.remove = acp63_audio_remove,
308308
.driver = {
309309
.name = "acp_asoc_acp63",
310310
.pm = &acp63_dma_pm_ops,

sound/soc/amd/acp/acp70.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ static const struct dev_pm_ops acp70_dma_pm_ops = {
278278

279279
static struct platform_driver acp70_driver = {
280280
.probe = acp_acp70_audio_probe,
281-
.remove_new = acp_acp70_audio_remove,
281+
.remove = acp_acp70_audio_remove,
282282
.driver = {
283283
.name = "acp_asoc_acp70",
284284
.pm = &acp70_dma_pm_ops,

sound/soc/amd/ps/ps-pdm-dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ static const struct dev_pm_ops acp63_pdm_pm_ops = {
448448

449449
static struct platform_driver acp63_pdm_dma_driver = {
450450
.probe = acp63_pdm_audio_probe,
451-
.remove_new = acp63_pdm_audio_remove,
451+
.remove = acp63_pdm_audio_remove,
452452
.driver = {
453453
.name = "acp_ps_pdm_dma",
454454
.pm = &acp63_pdm_pm_ops,

sound/soc/amd/ps/ps-sdw-dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ static const struct dev_pm_ops acp63_pm_ops = {
551551

552552
static struct platform_driver acp63_sdw_dma_driver = {
553553
.probe = acp63_sdw_platform_probe,
554-
.remove_new = acp63_sdw_platform_remove,
554+
.remove = acp63_sdw_platform_remove,
555555
.driver = {
556556
.name = "amd_ps_sdw_dma",
557557
.pm = &acp63_pm_ops,

0 commit comments

Comments
 (0)