Skip to content

Commit e3fc2fd

Browse files
ukleinektiwai
authored andcommitted
sound: 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 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 <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 5289d00 commit e3fc2fd

File tree

14 files changed

+15
-15
lines changed

14 files changed

+15
-15
lines changed

sound/arm/pxa2xx-ac97.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ static void pxa2xx_ac97_remove(struct platform_device *dev)
271271

272272
static struct platform_driver pxa2xx_ac97_driver = {
273273
.probe = pxa2xx_ac97_probe,
274-
.remove_new = pxa2xx_ac97_remove,
274+
.remove = pxa2xx_ac97_remove,
275275
.driver = {
276276
.name = "pxa2xx-ac97",
277277
.pm = &pxa2xx_ac97_pm_ops,

sound/atmel/ac97c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ static void atmel_ac97c_remove(struct platform_device *pdev)
861861

862862
static struct platform_driver atmel_ac97c_driver = {
863863
.probe = atmel_ac97c_probe,
864-
.remove_new = atmel_ac97c_remove,
864+
.remove = atmel_ac97c_remove,
865865
.driver = {
866866
.name = "atmel_ac97c",
867867
.pm = ATMEL_AC97C_PM_OPS,

sound/drivers/mts64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ static void snd_mts64_remove(struct platform_device *pdev)
10081008

10091009
static struct platform_driver snd_mts64_driver = {
10101010
.probe = snd_mts64_probe,
1011-
.remove_new = snd_mts64_remove,
1011+
.remove = snd_mts64_remove,
10121012
.driver = {
10131013
.name = PLATFORM_DRIVER,
10141014
}

sound/drivers/pcmtest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ static struct platform_device pcmtst_pdev = {
640640

641641
static struct platform_driver pcmtst_pdrv = {
642642
.probe = pcmtst_probe,
643-
.remove_new = pdev_remove,
643+
.remove = pdev_remove,
644644
.driver = {
645645
.name = "pcmtest",
646646
},

sound/drivers/portman2x4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ static void snd_portman_remove(struct platform_device *pdev)
794794

795795
static struct platform_driver snd_portman_driver = {
796796
.probe = snd_portman_probe,
797-
.remove_new = snd_portman_remove,
797+
.remove = snd_portman_remove,
798798
.driver = {
799799
.name = PLATFORM_DRIVER,
800800
}

sound/mips/hal2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ static void hal2_remove(struct platform_device *pdev)
886886

887887
static struct platform_driver hal2_driver = {
888888
.probe = hal2_probe,
889-
.remove_new = hal2_remove,
889+
.remove = hal2_remove,
890890
.driver = {
891891
.name = "sgihal2",
892892
}

sound/mips/sgio2audio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,8 +917,8 @@ static void snd_sgio2audio_remove(struct platform_device *pdev)
917917

918918
static struct platform_driver sgio2audio_driver = {
919919
.probe = snd_sgio2audio_probe,
920-
.remove_new = snd_sgio2audio_remove,
921-
.driver = {
920+
.remove = snd_sgio2audio_remove,
921+
.driver = {
922922
.name = "sgio2audio",
923923
}
924924
};

sound/oss/dmasound/dmasound_paula.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ static void __exit amiga_audio_remove(struct platform_device *pdev)
732732
* triggering a section mismatch warning.
733733
*/
734734
static struct platform_driver amiga_audio_driver __refdata = {
735-
.remove_new = __exit_p(amiga_audio_remove),
735+
.remove = __exit_p(amiga_audio_remove),
736736
.driver = {
737737
.name = "amiga-audio",
738738
},

sound/pci/hda/hda_tegra.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ static struct platform_driver tegra_platform_hda = {
606606
.of_match_table = hda_tegra_match,
607607
},
608608
.probe = hda_tegra_probe,
609-
.remove_new = hda_tegra_remove,
609+
.remove = hda_tegra_remove,
610610
.shutdown = hda_tegra_shutdown,
611611
};
612612
module_platform_driver(tegra_platform_hda);

sound/ppc/powermac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static SIMPLE_DEV_PM_OPS(snd_pmac_pm, snd_pmac_driver_suspend, snd_pmac_driver_r
160160

161161
static struct platform_driver snd_pmac_driver = {
162162
.probe = snd_pmac_probe,
163-
.remove_new = snd_pmac_remove,
163+
.remove = snd_pmac_remove,
164164
.driver = {
165165
.name = SND_PMAC_DRIVER,
166166
.pm = SND_PMAC_PM_OPS,

0 commit comments

Comments
 (0)