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>

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 4c367e73b2c9b3e35d7a4623935c8266cd92a203..77b11616a7ee05a45573d1b643f3192f35c0c38a 100644 (file)
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -271,7 +271,7 @@ static void pxa2xx_ac97_remove(struct platform_device *dev)
 
 static struct platform_driver pxa2xx_ac97_driver = {
        .probe          = pxa2xx_ac97_probe,
-       .remove_new     = pxa2xx_ac97_remove,
+       .remove         = pxa2xx_ac97_remove,
        .driver         = {
                .name   = "pxa2xx-ac97",
                .pm     = &pxa2xx_ac97_pm_ops,

diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 402b5f66dcc3026cc77de441e19f632480d7a992..d8f8e08f1bb7ef1c844a3e08012ff4c7d19754f6 100644 (file)
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -861,7 +861,7 @@ static void atmel_ac97c_remove(struct platform_device *pdev)
 
 static struct platform_driver atmel_ac97c_driver = {
        .probe          = atmel_ac97c_probe,
-       .remove_new     = atmel_ac97c_remove,
+       .remove         = atmel_ac97c_remove,
        .driver         = {
                .name   = "atmel_ac97c",
                .pm     = ATMEL_AC97C_PM_OPS,

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 6fc255a6754d1f98f062e17cc576f8a759531832..17f215bad0ec7741f4f255c767aaa0e29322daa8 100644 (file)
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -1008,7 +1008,7 @@ static void snd_mts64_remove(struct platform_device *pdev)
 
 static struct platform_driver snd_mts64_driver = {
        .probe  = snd_mts64_probe,
-       .remove_new = snd_mts64_remove,
+       .remove = snd_mts64_remove,
        .driver = {
                .name = PLATFORM_DRIVER,
        }

diff --git a/sound/drivers/pcmtest.c b/sound/drivers/pcmtest.c
index 21cefaf5419aad696d0a3ba4d4416d6cef06a6b2..72378f354fd01e198e3bd535d9e40b2cf8fb37ed 100644 (file)
--- a/sound/drivers/pcmtest.c
+++ b/sound/drivers/pcmtest.c
@@ -640,7 +640,7 @@ static struct platform_device pcmtst_pdev = {
 
 static struct platform_driver pcmtst_pdrv = {
        .probe =        pcmtst_probe,
-       .remove_new =   pdev_remove,
+       .remove =       pdev_remove,
        .driver =       {
                .name = "pcmtest",
        },

diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 54d818d2f53dc4f1525ee094796421f208d80f1b..5e4ef25a83a49fad582fd8545876ade9d01da1a4 100644 (file)
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -794,7 +794,7 @@ static void snd_portman_remove(struct platform_device *pdev)
 
 static struct platform_driver snd_portman_driver = {
        .probe  = snd_portman_probe,
-       .remove_new = snd_portman_remove,
+       .remove = snd_portman_remove,
        .driver = {
                .name = PLATFORM_DRIVER,
        }

diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index 3c26334227bb49ea9f8aaae8d101a3fcdf4c7a84..991793e6bda9b28080c892d1c008fe1c43c54d94 100644 (file)
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -886,7 +886,7 @@ static void hal2_remove(struct platform_device *pdev)
 
 static struct platform_driver hal2_driver = {
        .probe  = hal2_probe,
-       .remove_new = hal2_remove,
+       .remove = hal2_remove,
        .driver = {
                .name   = "sgihal2",
        }

diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index a8551ccdd1bf8a0792ae86fa75592a3afee7e016..4e2ff954ff5901821f2939de8c8a66a0dfdf3edd 100644 (file)
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -917,8 +917,8 @@ static void snd_sgio2audio_remove(struct platform_device *pdev)
 
 static struct platform_driver sgio2audio_driver = {
        .probe  = snd_sgio2audio_probe,
-       .remove_new = snd_sgio2audio_remove,
-       .driver = {
+       .remove = snd_sgio2audio_remove,
+       .driver = {
                .name   = "sgio2audio",
        }
 };

diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c
index b8fad12f9e5f58c63b4f9b6c13f47f99258cf90f..8d443a3663d3e9470c0849f31757aff33bb0bee8 100644 (file)
--- a/sound/oss/dmasound/dmasound_paula.c
+++ b/sound/oss/dmasound/dmasound_paula.c
@@ -732,7 +732,7 @@ static void __exit amiga_audio_remove(struct platform_device *pdev)
  * triggering a section mismatch warning.
  */
 static struct platform_driver amiga_audio_driver __refdata = {
-       .remove_new = __exit_p(amiga_audio_remove),
+       .remove = __exit_p(amiga_audio_remove),
        .driver = {
                .name   = "amiga-audio",
        },

diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
index d967e70a705859721a040155de8f512c83ab225e..b1e30a83dfb0cea007ab51c15587f03f323f9abd 100644 (file)
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@ -606,7 +606,7 @@ static struct platform_driver tegra_platform_hda = {
                .of_match_table = hda_tegra_match,
        },
        .probe = hda_tegra_probe,
-       .remove_new = hda_tegra_remove,
+       .remove = hda_tegra_remove,
        .shutdown = hda_tegra_shutdown,
 };
 module_platform_driver(tegra_platform_hda);

diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 8e29c92830ad64c7b36be5f08404764d78858bc0..f1b0cf9ea55557b055976211e1782d66e15a35c7 100644 (file)
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -160,7 +160,7 @@ static SIMPLE_DEV_PM_OPS(snd_pmac_pm, snd_pmac_driver_suspend, snd_pmac_driver_r
 
 static struct platform_driver snd_pmac_driver = {
        .probe          = snd_pmac_probe,
-       .remove_new     = snd_pmac_remove,
+       .remove         = snd_pmac_remove,
        .driver         = {
                .name   = SND_PMAC_DRIVER,
                .pm     = SND_PMAC_PM_OPS,

diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index 66b33623549ff5c503e4fcf78160efbc697535b9..39bf51ff43a1caea27c758755e554062a94e6950 100644 (file)
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -599,7 +599,7 @@ static int snd_aica_probe(struct platform_device *devptr)
 
 static struct platform_driver snd_aica_driver = {
        .probe = snd_aica_probe,
-       .remove_new = snd_aica_remove,
+       .remove = snd_aica_remove,
        .driver = {
                .name = SND_AICA_DRIVER,
        },

diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c
index e7b6ce7bd086bd11eb0be5e3b8b7eef9bb5ed1aa..e7b80328f0ef9d15baaac0c82b146cdd601c27bf 100644 (file)
--- a/sound/sh/sh_dac_audio.c
+++ b/sound/sh/sh_dac_audio.c
@@ -383,7 +383,7 @@ probe_error:
  */
 static struct platform_driver sh_dac_driver = {
        .probe  = snd_sh_dac_probe,
-       .remove_new = snd_sh_dac_remove,
+       .remove = snd_sh_dac_remove,
        .driver = {
                .name = "dac_audio",
        },

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index a1339f9ef12a6ad79d7cd13d53c2ed0071ffb297..1b44119edfbc4abf6ce77933a0e63dcc3cee97c5 100644 (file)
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2107,7 +2107,7 @@ static struct platform_driver cs4231_driver = {
                .of_match_table = cs4231_match,
        },
        .probe          = cs4231_probe,
-       .remove_new     = cs4231_remove,
+       .remove         = cs4231_remove,
 };
 
 module_platform_driver(cs4231_driver);

diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index b5d53c5550d30dc2b09556c80de819eb11764a0e..69f1c9e37f4b97ddda5b6dbac1e80c2809b5cf6a 100644 (file)
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2682,7 +2682,7 @@ static struct platform_driver dbri_sbus_driver = {
                .of_match_table = dbri_match,
        },
        .probe          = dbri_probe,
-       .remove_new     = dbri_remove,
+       .remove         = dbri_remove,
 };
 
 module_platform_driver(dbri_sbus_driver);