Commit e3fc2fd7 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Takashi Iwai
Browse files

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



After commit 0edb555a ("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: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/20241029073748.508077-2-u.kleine-koenig@baylibre.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5289d006

sound/arm/pxa2xx-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

sound/atmel/ac97c.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

sound/drivers/mts64.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	}

sound/drivers/pcmtest.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

	},

sound/drivers/portman2x4.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	}