mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-29 09:16:33 +00:00
sound: Switch back to struct platform_driver::remove()
After commit 0edb555a65
("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>
This commit is contained in:
parent
5289d00696
commit
e3fc2fd77c
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
}
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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,
|
||||
}
|
||||
|
@ -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",
|
||||
}
|
||||
|
@ -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",
|
||||
}
|
||||
};
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
},
|
||||
|
@ -383,7 +383,7 @@ static int snd_sh_dac_probe(struct platform_device *devptr)
|
||||
*/
|
||||
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",
|
||||
},
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user