Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

Convert all platform drivers below sound 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.

On the way do a few whitespace changes to make indention consistent.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/20241029073748.508077-2-u.kleine-koenig@baylibre.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Uwe Kleine-König and committed by
Takashi Iwai
e3fc2fd7 5289d006

+15 -15
+1 -1
sound/arm/pxa2xx-ac97.c
··· 271 271 272 272 static struct platform_driver pxa2xx_ac97_driver = { 273 273 .probe = pxa2xx_ac97_probe, 274 - .remove_new = pxa2xx_ac97_remove, 274 + .remove = pxa2xx_ac97_remove, 275 275 .driver = { 276 276 .name = "pxa2xx-ac97", 277 277 .pm = &pxa2xx_ac97_pm_ops,
+1 -1
sound/atmel/ac97c.c
··· 861 861 862 862 static struct platform_driver atmel_ac97c_driver = { 863 863 .probe = atmel_ac97c_probe, 864 - .remove_new = atmel_ac97c_remove, 864 + .remove = atmel_ac97c_remove, 865 865 .driver = { 866 866 .name = "atmel_ac97c", 867 867 .pm = ATMEL_AC97C_PM_OPS,
+1 -1
sound/drivers/mts64.c
··· 1008 1008 1009 1009 static struct platform_driver snd_mts64_driver = { 1010 1010 .probe = snd_mts64_probe, 1011 - .remove_new = snd_mts64_remove, 1011 + .remove = snd_mts64_remove, 1012 1012 .driver = { 1013 1013 .name = PLATFORM_DRIVER, 1014 1014 }
+1 -1
sound/drivers/pcmtest.c
··· 640 640 641 641 static struct platform_driver pcmtst_pdrv = { 642 642 .probe = pcmtst_probe, 643 - .remove_new = pdev_remove, 643 + .remove = pdev_remove, 644 644 .driver = { 645 645 .name = "pcmtest", 646 646 },
+1 -1
sound/drivers/portman2x4.c
··· 794 794 795 795 static struct platform_driver snd_portman_driver = { 796 796 .probe = snd_portman_probe, 797 - .remove_new = snd_portman_remove, 797 + .remove = snd_portman_remove, 798 798 .driver = { 799 799 .name = PLATFORM_DRIVER, 800 800 }
+1 -1
sound/mips/hal2.c
··· 886 886 887 887 static struct platform_driver hal2_driver = { 888 888 .probe = hal2_probe, 889 - .remove_new = hal2_remove, 889 + .remove = hal2_remove, 890 890 .driver = { 891 891 .name = "sgihal2", 892 892 }
+2 -2
sound/mips/sgio2audio.c
··· 917 917 918 918 static struct platform_driver sgio2audio_driver = { 919 919 .probe = snd_sgio2audio_probe, 920 - .remove_new = snd_sgio2audio_remove, 921 - .driver = { 920 + .remove = snd_sgio2audio_remove, 921 + .driver = { 922 922 .name = "sgio2audio", 923 923 } 924 924 };
+1 -1
sound/oss/dmasound/dmasound_paula.c
··· 732 732 * triggering a section mismatch warning. 733 733 */ 734 734 static struct platform_driver amiga_audio_driver __refdata = { 735 - .remove_new = __exit_p(amiga_audio_remove), 735 + .remove = __exit_p(amiga_audio_remove), 736 736 .driver = { 737 737 .name = "amiga-audio", 738 738 },
+1 -1
sound/pci/hda/hda_tegra.c
··· 606 606 .of_match_table = hda_tegra_match, 607 607 }, 608 608 .probe = hda_tegra_probe, 609 - .remove_new = hda_tegra_remove, 609 + .remove = hda_tegra_remove, 610 610 .shutdown = hda_tegra_shutdown, 611 611 }; 612 612 module_platform_driver(tegra_platform_hda);
+1 -1
sound/ppc/powermac.c
··· 160 160 161 161 static struct platform_driver snd_pmac_driver = { 162 162 .probe = snd_pmac_probe, 163 - .remove_new = snd_pmac_remove, 163 + .remove = snd_pmac_remove, 164 164 .driver = { 165 165 .name = SND_PMAC_DRIVER, 166 166 .pm = SND_PMAC_PM_OPS,
+1 -1
sound/sh/aica.c
··· 599 599 600 600 static struct platform_driver snd_aica_driver = { 601 601 .probe = snd_aica_probe, 602 - .remove_new = snd_aica_remove, 602 + .remove = snd_aica_remove, 603 603 .driver = { 604 604 .name = SND_AICA_DRIVER, 605 605 },
+1 -1
sound/sh/sh_dac_audio.c
··· 383 383 */ 384 384 static struct platform_driver sh_dac_driver = { 385 385 .probe = snd_sh_dac_probe, 386 - .remove_new = snd_sh_dac_remove, 386 + .remove = snd_sh_dac_remove, 387 387 .driver = { 388 388 .name = "dac_audio", 389 389 },
+1 -1
sound/sparc/cs4231.c
··· 2107 2107 .of_match_table = cs4231_match, 2108 2108 }, 2109 2109 .probe = cs4231_probe, 2110 - .remove_new = cs4231_remove, 2110 + .remove = cs4231_remove, 2111 2111 }; 2112 2112 2113 2113 module_platform_driver(cs4231_driver);
+1 -1
sound/sparc/dbri.c
··· 2682 2682 .of_match_table = dbri_match, 2683 2683 }, 2684 2684 .probe = dbri_probe, 2685 - .remove_new = dbri_remove, 2685 + .remove = dbri_remove, 2686 2686 }; 2687 2687 2688 2688 module_platform_driver(dbri_sbus_driver);