openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: ux500: 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: 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:35 -05:00 committed by Mark Brown
parent d8628d1c82
commit da794876f2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/ux500/mop500.c
View File

@ -71,8 +71,8 @@ static void mop500_of_node_put(void)
} }
} }
static int __devinit mop500_of_probe(struct platform_device *pdev, static int mop500_of_probe(struct platform_device *pdev,
struct device_node *np) struct device_node *np)
{ {
struct device_node *codec_np, *msp_np[2]; struct device_node *codec_np, *msp_np[2];
int i; int i;
@ -99,7 +99,7 @@ static int __devinit mop500_of_probe(struct platform_device *pdev,
return 0; return 0;
} }
static int __devinit mop500_probe(struct platform_device *pdev) static int mop500_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
int ret; int ret;
@ -136,7 +136,7 @@ static int __devinit mop500_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit mop500_remove(struct platform_device *pdev) static int mop500_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *mop500_card = platform_get_drvdata(pdev); struct snd_soc_card *mop500_card = platform_get_drvdata(pdev);
@ -161,7 +161,7 @@ static struct platform_driver snd_soc_mop500_driver = {
.of_match_table = snd_soc_mop500_match, .of_match_table = snd_soc_mop500_match,
}, },
.probe = mop500_probe, .probe = mop500_probe,
.remove = __devexit_p(mop500_remove), .remove = mop500_remove,
}; };
module_platform_driver(snd_soc_mop500_driver); module_platform_driver(snd_soc_mop500_driver);

4
sound/soc/ux500/ux500_msp_dai.c
View File

@ -768,7 +768,7 @@ static struct snd_soc_dai_driver ux500_msp_dai_drv[UX500_NBR_OF_DAI] = {
}, },
}; };
static int __devinit ux500_msp_drv_probe(struct platform_device *pdev) static int ux500_msp_drv_probe(struct platform_device *pdev)
{ {
struct ux500_msp_i2s_drvdata *drvdata; struct ux500_msp_i2s_drvdata *drvdata;
int ret = 0; int ret = 0;
@ -855,7 +855,7 @@ static int __devinit ux500_msp_drv_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ux500_msp_drv_remove(struct platform_device *pdev) static int ux500_msp_drv_remove(struct platform_device *pdev)
{ {
struct ux500_msp_i2s_drvdata *drvdata = dev_get_drvdata(&pdev->dev); struct ux500_msp_i2s_drvdata *drvdata = dev_get_drvdata(&pdev->dev);

4
sound/soc/ux500/ux500_pcm.c
View File

@ -282,7 +282,7 @@ static struct snd_soc_platform_driver ux500_pcm_soc_drv = {
.pcm_new = ux500_pcm_new, .pcm_new = ux500_pcm_new,
}; };
int __devinit ux500_pcm_register_platform(struct platform_device *pdev) int ux500_pcm_register_platform(struct platform_device *pdev)
{ {
int ret; int ret;
@ -298,7 +298,7 @@ int __devinit ux500_pcm_register_platform(struct platform_device *pdev)
} }
EXPORT_SYMBOL_GPL(ux500_pcm_register_platform); EXPORT_SYMBOL_GPL(ux500_pcm_register_platform);
int __devexit ux500_pcm_unregister_platform(struct platform_device *pdev) int ux500_pcm_unregister_platform(struct platform_device *pdev)
{ {
snd_soc_unregister_platform(&pdev->dev); snd_soc_unregister_platform(&pdev->dev);