Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: mxs: 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:27 -05:00 committed by Mark Brown
parent 34e15fbdaa
commit fd582736ab
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/mxs/mxs-pcm.c
View File

@ -220,13 +220,13 @@ static struct snd_soc_platform_driver mxs_soc_platform = {
.pcm_free = mxs_pcm_free, .pcm_free = mxs_pcm_free,
}; };
int __devinit mxs_pcm_platform_register(struct device *dev) int mxs_pcm_platform_register(struct device *dev)
{ {
return snd_soc_register_platform(dev, &mxs_soc_platform); return snd_soc_register_platform(dev, &mxs_soc_platform);
} }
EXPORT_SYMBOL_GPL(mxs_pcm_platform_register); EXPORT_SYMBOL_GPL(mxs_pcm_platform_register);
void __devexit mxs_pcm_platform_unregister(struct device *dev) void mxs_pcm_platform_unregister(struct device *dev)
{ {
snd_soc_unregister_platform(dev); snd_soc_unregister_platform(dev);
} }

6
sound/soc/mxs/mxs-saif.c
View File

@ -657,7 +657,7 @@ static irqreturn_t mxs_saif_irq(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit mxs_saif_probe(struct platform_device *pdev) static int mxs_saif_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct resource *iores, *dmares; struct resource *iores, *dmares;
@ -792,7 +792,7 @@ failed_pdev_alloc:
return ret; return ret;
} }
static int __devexit mxs_saif_remove(struct platform_device *pdev) static int mxs_saif_remove(struct platform_device *pdev)
{ {
mxs_pcm_platform_unregister(&pdev->dev); mxs_pcm_platform_unregister(&pdev->dev);
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_dai(&pdev->dev);
@ -808,7 +808,7 @@ MODULE_DEVICE_TABLE(of, mxs_saif_dt_ids);
static struct platform_driver mxs_saif_driver = { static struct platform_driver mxs_saif_driver = {
.probe = mxs_saif_probe, .probe = mxs_saif_probe,
.remove = __devexit_p(mxs_saif_remove), .remove = mxs_saif_remove,
.driver = { .driver = {
.name = "mxs-saif", .name = "mxs-saif",

8
sound/soc/mxs/mxs-sgtl5000.c
View File

@ -112,7 +112,7 @@ static struct snd_soc_card mxs_sgtl5000 = {
.num_links = ARRAY_SIZE(mxs_sgtl5000_dai), .num_links = ARRAY_SIZE(mxs_sgtl5000_dai),
}; };
static int __devinit mxs_sgtl5000_probe_dt(struct platform_device *pdev) static int mxs_sgtl5000_probe_dt(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device_node *saif_np[2], *codec_np; struct device_node *saif_np[2], *codec_np;
@ -145,7 +145,7 @@ static int __devinit mxs_sgtl5000_probe_dt(struct platform_device *pdev)
return ret; return ret;
} }
static int __devinit mxs_sgtl5000_probe(struct platform_device *pdev) static int mxs_sgtl5000_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &mxs_sgtl5000; struct snd_soc_card *card = &mxs_sgtl5000;
int ret; int ret;
@ -176,7 +176,7 @@ static int __devinit mxs_sgtl5000_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit mxs_sgtl5000_remove(struct platform_device *pdev) static int mxs_sgtl5000_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -200,7 +200,7 @@ static struct platform_driver mxs_sgtl5000_audio_driver = {
.of_match_table = mxs_sgtl5000_dt_ids, .of_match_table = mxs_sgtl5000_dt_ids,
}, },
.probe = mxs_sgtl5000_probe, .probe = mxs_sgtl5000_probe,
.remove = __devexit_p(mxs_sgtl5000_remove), .remove = mxs_sgtl5000_remove,
}; };
module_platform_driver(mxs_sgtl5000_audio_driver); module_platform_driver(mxs_sgtl5000_audio_driver);