Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 145e2879 authored by Bill Pemberton's avatar Bill Pemberton Committed by Mark Brown
Browse files

ASoC: cirrus: remove __dev* attributes 



CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5c658be0

sound/soc/cirrus/edb93xx.c

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct snd_soc_card snd_soc_edb93xx = { 
	.num_links	= 1,

};



static int __devinit edb93xx_probe(struct platform_device *pdev)

static int edb93xx_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card = &snd_soc_edb93xx;

	int ret;
@@ -101,7 +101,7 @@ static int __devinit edb93xx_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit edb93xx_remove(struct platform_device *pdev)

static int edb93xx_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);
@@ -117,7 +117,7 @@ static struct platform_driver edb93xx_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= edb93xx_probe,

	.remove		= __devexit_p(edb93xx_remove),

	.remove		= edb93xx_remove,

};



module_platform_driver(edb93xx_driver);

sound/soc/cirrus/ep93xx-ac97.c

+3 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = { 
	.ops			= &ep93xx_ac97_dai_ops,

};



static int __devinit ep93xx_ac97_probe(struct platform_device *pdev)

static int ep93xx_ac97_probe(struct platform_device *pdev)

{

	struct ep93xx_ac97_info *info;

	struct resource *res;
@@ -402,7 +402,7 @@ static int __devinit ep93xx_ac97_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit ep93xx_ac97_remove(struct platform_device *pdev)

static int ep93xx_ac97_remove(struct platform_device *pdev)

{

	struct ep93xx_ac97_info	*info = platform_get_drvdata(pdev);
@@ -420,7 +420,7 @@ static int __devexit ep93xx_ac97_remove(struct platform_device *pdev) 


static struct platform_driver ep93xx_ac97_driver = {

	.probe	= ep93xx_ac97_probe,

	.remove	= __devexit_p(ep93xx_ac97_remove),

	.remove	= ep93xx_ac97_remove,

	.driver = {

		.name = "ep93xx-ac97",

		.owner = THIS_MODULE,

sound/soc/cirrus/ep93xx-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit ep93xx_i2s_remove(struct platform_device *pdev)

static int ep93xx_i2s_remove(struct platform_device *pdev)

{

	struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
@@ -436,7 +436,7 @@ static int __devexit ep93xx_i2s_remove(struct platform_device *pdev) 


static struct platform_driver ep93xx_i2s_driver = {

	.probe	= ep93xx_i2s_probe,

	.remove	= __devexit_p(ep93xx_i2s_remove),

	.remove	= ep93xx_i2s_remove,

	.driver	= {

		.name	= "ep93xx-i2s",

		.owner	= THIS_MODULE,

sound/soc/cirrus/ep93xx-pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -213,12 +213,12 @@ static struct snd_soc_platform_driver ep93xx_soc_platform = { 
	.pcm_free	= &ep93xx_pcm_free_dma_buffers,

};



static int __devinit ep93xx_soc_platform_probe(struct platform_device *pdev)

static int ep93xx_soc_platform_probe(struct platform_device *pdev)

{

	return snd_soc_register_platform(&pdev->dev, &ep93xx_soc_platform);

}



static int __devexit ep93xx_soc_platform_remove(struct platform_device *pdev)

static int ep93xx_soc_platform_remove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);

	return 0;
@@ -231,7 +231,7 @@ static struct platform_driver ep93xx_pcm_driver = { 
	},



	.probe = ep93xx_soc_platform_probe,

	.remove = __devexit_p(ep93xx_soc_platform_remove),

	.remove = ep93xx_soc_platform_remove,

};



module_platform_driver(ep93xx_pcm_driver);

sound/soc/cirrus/simone.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct snd_soc_card snd_soc_simone = { 


static struct platform_device *simone_snd_ac97_device;



static int __devinit simone_probe(struct platform_device *pdev)

static int simone_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card = &snd_soc_simone;

	int ret;
@@ -63,7 +63,7 @@ static int __devinit simone_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit simone_remove(struct platform_device *pdev)

static int simone_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);
@@ -79,7 +79,7 @@ static struct platform_driver simone_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= simone_probe,

	.remove		= __devexit_p(simone_remove),

	.remove		= simone_remove,

};



module_platform_driver(simone_driver);