Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
sound/soc/cirrus/edb93xx.c
View file @ 145e2879
...@@ -80,7 +80,7 @@ static struct snd_soc_card snd_soc_edb93xx = { ...@@ -80,7 +80,7 @@ static struct snd_soc_card snd_soc_edb93xx = {
.num_links = 1, .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; struct snd_soc_card *card = &snd_soc_edb93xx;
int ret; int ret;
...@@ -101,7 +101,7 @@ static int __devinit edb93xx_probe(struct platform_device *pdev) ...@@ -101,7 +101,7 @@ static int __devinit edb93xx_probe(struct platform_device *pdev)
return ret; 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); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -117,7 +117,7 @@ static struct platform_driver edb93xx_driver = { ...@@ -117,7 +117,7 @@ static struct platform_driver edb93xx_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = edb93xx_probe, .probe = edb93xx_probe,
.remove = __devexit_p(edb93xx_remove), .remove = edb93xx_remove,
}; };
module_platform_driver(edb93xx_driver); module_platform_driver(edb93xx_driver);
......
sound/soc/cirrus/ep93xx-ac97.c
View file @ 145e2879
...@@ -352,7 +352,7 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = { ...@@ -352,7 +352,7 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = {
.ops = &ep93xx_ac97_dai_ops, .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 ep93xx_ac97_info *info;
struct resource *res; struct resource *res;
...@@ -402,7 +402,7 @@ static int __devinit ep93xx_ac97_probe(struct platform_device *pdev) ...@@ -402,7 +402,7 @@ static int __devinit ep93xx_ac97_probe(struct platform_device *pdev)
return ret; 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); struct ep93xx_ac97_info *info = platform_get_drvdata(pdev);
...@@ -420,7 +420,7 @@ static int __devexit ep93xx_ac97_remove(struct platform_device *pdev) ...@@ -420,7 +420,7 @@ static int __devexit ep93xx_ac97_remove(struct platform_device *pdev)
static struct platform_driver ep93xx_ac97_driver = { static struct platform_driver ep93xx_ac97_driver = {
.probe = ep93xx_ac97_probe, .probe = ep93xx_ac97_probe,
.remove = __devexit_p(ep93xx_ac97_remove), .remove = ep93xx_ac97_remove,
.driver = { .driver = {
.name = "ep93xx-ac97", .name = "ep93xx-ac97",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/soc/cirrus/ep93xx-i2s.c
View file @ 145e2879
...@@ -422,7 +422,7 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) ...@@ -422,7 +422,7 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
return err; 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); struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
...@@ -436,7 +436,7 @@ static int __devexit ep93xx_i2s_remove(struct platform_device *pdev) ...@@ -436,7 +436,7 @@ static int __devexit ep93xx_i2s_remove(struct platform_device *pdev)
static struct platform_driver ep93xx_i2s_driver = { static struct platform_driver ep93xx_i2s_driver = {
.probe = ep93xx_i2s_probe, .probe = ep93xx_i2s_probe,
.remove = __devexit_p(ep93xx_i2s_remove), .remove = ep93xx_i2s_remove,
.driver = { .driver = {
.name = "ep93xx-i2s", .name = "ep93xx-i2s",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/soc/cirrus/ep93xx-pcm.c
View file @ 145e2879
...@@ -213,12 +213,12 @@ static struct snd_soc_platform_driver ep93xx_soc_platform = { ...@@ -213,12 +213,12 @@ static struct snd_soc_platform_driver ep93xx_soc_platform = {
.pcm_free = &ep93xx_pcm_free_dma_buffers, .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); 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); snd_soc_unregister_platform(&pdev->dev);
return 0; return 0;
...@@ -231,7 +231,7 @@ static struct platform_driver ep93xx_pcm_driver = { ...@@ -231,7 +231,7 @@ static struct platform_driver ep93xx_pcm_driver = {
}, },
.probe = ep93xx_soc_platform_probe, .probe = ep93xx_soc_platform_probe,
.remove = __devexit_p(ep93xx_soc_platform_remove), .remove = ep93xx_soc_platform_remove,
}; };
module_platform_driver(ep93xx_pcm_driver); module_platform_driver(ep93xx_pcm_driver);
......
sound/soc/cirrus/simone.c
View file @ 145e2879
...@@ -41,7 +41,7 @@ static struct snd_soc_card snd_soc_simone = { ...@@ -41,7 +41,7 @@ static struct snd_soc_card snd_soc_simone = {
static struct platform_device *simone_snd_ac97_device; 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; struct snd_soc_card *card = &snd_soc_simone;
int ret; int ret;
...@@ -63,7 +63,7 @@ static int __devinit simone_probe(struct platform_device *pdev) ...@@ -63,7 +63,7 @@ static int __devinit simone_probe(struct platform_device *pdev)
return ret; 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); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -79,7 +79,7 @@ static struct platform_driver simone_driver = { ...@@ -79,7 +79,7 @@ static struct platform_driver simone_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = simone_probe, .probe = simone_probe,
.remove = __devexit_p(simone_remove), .remove = simone_remove,
}; };
module_platform_driver(simone_driver); module_platform_driver(simone_driver);
......
sound/soc/cirrus/snappercl15.c
View file @ 145e2879
...@@ -98,7 +98,7 @@ static struct snd_soc_card snd_soc_snappercl15 = { ...@@ -98,7 +98,7 @@ static struct snd_soc_card snd_soc_snappercl15 = {
.num_links = 1, .num_links = 1,
}; };
static int __devinit snappercl15_probe(struct platform_device *pdev) static int snappercl15_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &snd_soc_snappercl15; struct snd_soc_card *card = &snd_soc_snappercl15;
int ret; int ret;
...@@ -119,7 +119,7 @@ static int __devinit snappercl15_probe(struct platform_device *pdev) ...@@ -119,7 +119,7 @@ static int __devinit snappercl15_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit snappercl15_remove(struct platform_device *pdev) static int snappercl15_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -135,7 +135,7 @@ static struct platform_driver snappercl15_driver = { ...@@ -135,7 +135,7 @@ static struct platform_driver snappercl15_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = snappercl15_probe, .probe = snappercl15_probe,
.remove = __devexit_p(snappercl15_remove), .remove = snappercl15_remove,
}; };
module_platform_driver(snappercl15_driver); module_platform_driver(snappercl15_driver);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7