evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: kirkwood: remove __dev* attributes

Browse source 
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: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Bill Pemberton 2012-12-07 09:26:26 -05:00 • committed by Mark Brown
parent 7759f2ea94
commit 34e15fbdaa
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/kirkwood/kirkwood-dma.c
View file

@ -372,12 +372,12 @@ static struct snd_soc_platform_driver kirkwood_soc_platform = {
.pcm_free = kirkwood_dma_free_dma_buffers, .pcm_free = kirkwood_dma_free_dma_buffers,
}; };
static int __devinit kirkwood_soc_platform_probe(struct platform_device *pdev) static int kirkwood_soc_platform_probe(struct platform_device *pdev)
{ {
return snd_soc_register_platform(&pdev->dev, &kirkwood_soc_platform); return snd_soc_register_platform(&pdev->dev, &kirkwood_soc_platform);
} }
static int __devexit kirkwood_soc_platform_remove(struct platform_device *pdev) static int kirkwood_soc_platform_remove(struct platform_device *pdev)
{ {
snd_soc_unregister_platform(&pdev->dev); snd_soc_unregister_platform(&pdev->dev);
return 0; return 0;
@ -390,7 +390,7 @@ static struct platform_driver kirkwood_pcm_driver = {
}, },
.probe = kirkwood_soc_platform_probe, .probe = kirkwood_soc_platform_probe,
.remove = __devexit_p(kirkwood_soc_platform_remove), .remove = kirkwood_soc_platform_remove,
}; };
module_platform_driver(kirkwood_pcm_driver); module_platform_driver(kirkwood_pcm_driver);

6
sound/soc/kirkwood/kirkwood-i2s.c
View file

@ -451,7 +451,7 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = {
.ops = &kirkwood_i2s_dai_ops, .ops = &kirkwood_i2s_dai_ops,
}; };
static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev) static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
{ {
struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data; struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data;
struct snd_soc_dai_driver *soc_dai = &kirkwood_i2s_dai; struct snd_soc_dai_driver *soc_dai = &kirkwood_i2s_dai;
@ -540,7 +540,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
return err; return err;
} }
static __devexit int kirkwood_i2s_dev_remove(struct platform_device *pdev) static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
{ {
struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev); struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);
@ -557,7 +557,7 @@ static __devexit int kirkwood_i2s_dev_remove(struct platform_device *pdev)
static struct platform_driver kirkwood_i2s_driver = { static struct platform_driver kirkwood_i2s_driver = {
.probe = kirkwood_i2s_dev_probe, .probe = kirkwood_i2s_dev_probe,
.remove = __devexit_p(kirkwood_i2s_dev_remove), .remove = kirkwood_i2s_dev_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
sound/soc/kirkwood/kirkwood-openrd.c
View file

@ -71,7 +71,7 @@ static struct snd_soc_card openrd_client = {
.num_links = ARRAY_SIZE(openrd_client_dai), .num_links = ARRAY_SIZE(openrd_client_dai),
}; };
static int __devinit openrd_probe(struct platform_device *pdev) static int openrd_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &openrd_client; struct snd_soc_card *card = &openrd_client;
int ret; int ret;
@ -85,7 +85,7 @@ static int __devinit openrd_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit openrd_remove(struct platform_device *pdev) static int openrd_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -99,7 +99,7 @@ static struct platform_driver openrd_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = openrd_probe, .probe = openrd_probe,
.remove = __devexit_p(openrd_remove), .remove = openrd_remove,
}; };
module_platform_driver(openrd_driver); module_platform_driver(openrd_driver);

6
sound/soc/kirkwood/kirkwood-t5325.c
View file

@ -92,7 +92,7 @@ static struct snd_soc_card t5325 = {
.num_dapm_routes = ARRAY_SIZE(t5325_route), .num_dapm_routes = ARRAY_SIZE(t5325_route),
}; };
static int __devinit t5325_probe(struct platform_device *pdev) static int t5325_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &t5325; struct snd_soc_card *card = &t5325;
int ret; int ret;
@ -106,7 +106,7 @@ static int __devinit t5325_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit t5325_remove(struct platform_device *pdev) static int t5325_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -120,7 +120,7 @@ static struct platform_driver t5325_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = t5325_probe, .probe = t5325_probe,
.remove = __devexit_p(t5325_remove), .remove = t5325_remove,
}; };
module_platform_driver(t5325_driver); module_platform_driver(t5325_driver);