Unverified Commit ec380a34 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Drop empty platform remove functions 

Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:

Hello,

this patch series removes all platform remove functions that only return
zero below sound/soc. There is no reason to have these, as the only
caller is platform core code doing:

        if (drv->remove) {
                int ret = drv->remove(dev);

                ...
        }

(in platform_remove()) and so having no remove function is both
equivalent and simpler.
parents 35108d6d 603d96c9

sound/soc/amd/raven/acp3x-i2s.c

+0 −8
Original line number Diff line number Diff line
@@ -315,16 +315,8 @@ static int acp3x_dai_probe(struct platform_device *pdev) 
	return 0;

}



static int acp3x_dai_remove(struct platform_device *pdev)

{

	/* As we use devm_ memory alloc there is nothing TBD here */



	return 0;

}



static struct platform_driver acp3x_dai_driver = {

	.probe = acp3x_dai_probe,

	.remove = acp3x_dai_remove,

	.driver = {

		.name = "acp3x_i2s_playcap",

	},

sound/soc/atmel/atmel-classd.c

+0 −6
Original line number Diff line number Diff line
@@ -616,11 +616,6 @@ static int atmel_classd_probe(struct platform_device *pdev) 
	return ret;

}



static int atmel_classd_remove(struct platform_device *pdev)

{

	return 0;

}



static struct platform_driver atmel_classd_driver = {

	.driver	= {

		.name		= "atmel-classd",
@@ -628,7 +623,6 @@ static struct platform_driver atmel_classd_driver = { 
		.pm		= &snd_soc_pm_ops,

	},

	.probe	= atmel_classd_probe,

	.remove	= atmel_classd_remove,

};

module_platform_driver(atmel_classd_driver);

sound/soc/atmel/atmel-pdmic.c

+0 −6
Original line number Diff line number Diff line
@@ -692,11 +692,6 @@ static int atmel_pdmic_probe(struct platform_device *pdev) 
	return ret;

}



static int atmel_pdmic_remove(struct platform_device *pdev)

{

	return 0;

}



static struct platform_driver atmel_pdmic_driver = {

	.driver	= {

		.name		= "atmel-pdmic",
@@ -704,7 +699,6 @@ static struct platform_driver atmel_pdmic_driver = { 
		.pm		= &snd_soc_pm_ops,

	},

	.probe	= atmel_pdmic_probe,

	.remove	= atmel_pdmic_remove,

};

module_platform_driver(atmel_pdmic_driver);

sound/soc/codecs/88pm860x-codec.c

+0 −6
Original line number Diff line number Diff line
@@ -1386,17 +1386,11 @@ static int pm860x_codec_probe(struct platform_device *pdev) 
	return ret;

}



static int pm860x_codec_remove(struct platform_device *pdev)

{

	return 0;

}



static struct platform_driver pm860x_codec_driver = {

	.driver	= {

		.name	= "88pm860x-codec",

	},

	.probe	= pm860x_codec_probe,

	.remove	= pm860x_codec_remove,

};



module_platform_driver(pm860x_codec_driver);

sound/soc/codecs/ac97.c

+0 −6
Original line number Diff line number Diff line
@@ -127,18 +127,12 @@ static int ac97_probe(struct platform_device *pdev) 
			&soc_component_dev_ac97, &ac97_dai, 1);

}



static int ac97_remove(struct platform_device *pdev)

{

	return 0;

}



static struct platform_driver ac97_codec_driver = {

	.driver = {

		.name = "ac97-codec",

	},



	.probe = ac97_probe,

	.remove = ac97_remove,

};



module_platform_driver(ac97_codec_driver);