ASoC: blackfin: 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:
parent
b022aba588
commit
dca66dab76
|
@ -453,12 +453,12 @@ static struct snd_soc_platform_driver bf5xx_ac97_soc_platform = {
|
|||
.pcm_free = bf5xx_pcm_free_dma_buffers,
|
||||
};
|
||||
|
||||
static int __devinit bf5xx_soc_platform_probe(struct platform_device *pdev)
|
||||
static int bf5xx_soc_platform_probe(struct platform_device *pdev)
|
||||
{
|
||||
return snd_soc_register_platform(&pdev->dev, &bf5xx_ac97_soc_platform);
|
||||
}
|
||||
|
||||
static int __devexit bf5xx_soc_platform_remove(struct platform_device *pdev)
|
||||
static int bf5xx_soc_platform_remove(struct platform_device *pdev)
|
||||
{
|
||||
snd_soc_unregister_platform(&pdev->dev);
|
||||
return 0;
|
||||
|
@ -471,7 +471,7 @@ static struct platform_driver bf5xx_pcm_driver = {
|
|||
},
|
||||
|
||||
.probe = bf5xx_soc_platform_probe,
|
||||
.remove = __devexit_p(bf5xx_soc_platform_remove),
|
||||
.remove = bf5xx_soc_platform_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bf5xx_pcm_driver);
|
||||
|
|
|
@ -282,7 +282,7 @@ static struct snd_soc_dai_driver bfin_ac97_dai = {
|
|||
.formats = SNDRV_PCM_FMTBIT_S16_LE, },
|
||||
};
|
||||
|
||||
static int __devinit asoc_bfin_ac97_probe(struct platform_device *pdev)
|
||||
static int asoc_bfin_ac97_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sport_device *sport_handle;
|
||||
int ret;
|
||||
|
@ -352,7 +352,7 @@ gpio_err:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit asoc_bfin_ac97_remove(struct platform_device *pdev)
|
||||
static int asoc_bfin_ac97_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct sport_device *sport_handle = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -372,7 +372,7 @@ static struct platform_driver asoc_bfin_ac97_driver = {
|
|||
},
|
||||
|
||||
.probe = asoc_bfin_ac97_probe,
|
||||
.remove = __devexit_p(asoc_bfin_ac97_remove),
|
||||
.remove = asoc_bfin_ac97_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(asoc_bfin_ac97_driver);
|
||||
|
|
|
@ -75,7 +75,7 @@ static struct snd_soc_card bf5xx_ad1836 = {
|
|||
.num_links = 1,
|
||||
};
|
||||
|
||||
static __devinit int bf5xx_ad1836_driver_probe(struct platform_device *pdev)
|
||||
static int bf5xx_ad1836_driver_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = &bf5xx_ad1836;
|
||||
const char **link_name;
|
||||
|
@ -98,7 +98,7 @@ static __devinit int bf5xx_ad1836_driver_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit bf5xx_ad1836_driver_remove(struct platform_device *pdev)
|
||||
static int bf5xx_ad1836_driver_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -113,7 +113,7 @@ static struct platform_driver bf5xx_ad1836_driver = {
|
|||
.pm = &snd_soc_pm_ops,
|
||||
},
|
||||
.probe = bf5xx_ad1836_driver_probe,
|
||||
.remove = __devexit_p(bf5xx_ad1836_driver_remove),
|
||||
.remove = bf5xx_ad1836_driver_remove,
|
||||
};
|
||||
module_platform_driver(bf5xx_ad1836_driver);
|
||||
|
||||
|
|
|
@ -292,12 +292,12 @@ static struct snd_soc_platform_driver bf5xx_i2s_soc_platform = {
|
|||
.pcm_free = bf5xx_pcm_free_dma_buffers,
|
||||
};
|
||||
|
||||
static int __devinit bfin_i2s_soc_platform_probe(struct platform_device *pdev)
|
||||
static int bfin_i2s_soc_platform_probe(struct platform_device *pdev)
|
||||
{
|
||||
return snd_soc_register_platform(&pdev->dev, &bf5xx_i2s_soc_platform);
|
||||
}
|
||||
|
||||
static int __devexit bfin_i2s_soc_platform_remove(struct platform_device *pdev)
|
||||
static int bfin_i2s_soc_platform_remove(struct platform_device *pdev)
|
||||
{
|
||||
snd_soc_unregister_platform(&pdev->dev);
|
||||
return 0;
|
||||
|
@ -310,7 +310,7 @@ static struct platform_driver bfin_i2s_pcm_driver = {
|
|||
},
|
||||
|
||||
.probe = bfin_i2s_soc_platform_probe,
|
||||
.remove = __devexit_p(bfin_i2s_soc_platform_remove),
|
||||
.remove = bfin_i2s_soc_platform_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bfin_i2s_pcm_driver);
|
||||
|
|
|
@ -245,7 +245,7 @@ static struct snd_soc_dai_driver bf5xx_i2s_dai = {
|
|||
.ops = &bf5xx_i2s_dai_ops,
|
||||
};
|
||||
|
||||
static int __devinit bf5xx_i2s_probe(struct platform_device *pdev)
|
||||
static int bf5xx_i2s_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sport_device *sport_handle;
|
||||
int ret;
|
||||
|
@ -267,7 +267,7 @@ static int __devinit bf5xx_i2s_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit bf5xx_i2s_remove(struct platform_device *pdev)
|
||||
static int bf5xx_i2s_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct sport_device *sport_handle = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -281,7 +281,7 @@ static int __devexit bf5xx_i2s_remove(struct platform_device *pdev)
|
|||
|
||||
static struct platform_driver bfin_i2s_driver = {
|
||||
.probe = bf5xx_i2s_probe,
|
||||
.remove = __devexit_p(bf5xx_i2s_remove),
|
||||
.remove = bf5xx_i2s_remove,
|
||||
.driver = {
|
||||
.name = "bfin-i2s",
|
||||
.owner = THIS_MODULE,
|
||||
|
|
|
@ -317,12 +317,12 @@ static struct snd_soc_platform_driver bf5xx_tdm_soc_platform = {
|
|||
.pcm_free = bf5xx_pcm_free_dma_buffers,
|
||||
};
|
||||
|
||||
static int __devinit bf5xx_soc_platform_probe(struct platform_device *pdev)
|
||||
static int bf5xx_soc_platform_probe(struct platform_device *pdev)
|
||||
{
|
||||
return snd_soc_register_platform(&pdev->dev, &bf5xx_tdm_soc_platform);
|
||||
}
|
||||
|
||||
static int __devexit bf5xx_soc_platform_remove(struct platform_device *pdev)
|
||||
static int bf5xx_soc_platform_remove(struct platform_device *pdev)
|
||||
{
|
||||
snd_soc_unregister_platform(&pdev->dev);
|
||||
return 0;
|
||||
|
@ -335,7 +335,7 @@ static struct platform_driver bfin_tdm_driver = {
|
|||
},
|
||||
|
||||
.probe = bf5xx_soc_platform_probe,
|
||||
.remove = __devexit_p(bf5xx_soc_platform_remove),
|
||||
.remove = bf5xx_soc_platform_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bfin_tdm_driver);
|
||||
|
|
|
@ -249,7 +249,7 @@ static struct snd_soc_dai_driver bf5xx_tdm_dai = {
|
|||
.ops = &bf5xx_tdm_dai_ops,
|
||||
};
|
||||
|
||||
static int __devinit bfin_tdm_probe(struct platform_device *pdev)
|
||||
static int bfin_tdm_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sport_device *sport_handle;
|
||||
int ret;
|
||||
|
@ -295,7 +295,7 @@ sport_config_err:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit bfin_tdm_remove(struct platform_device *pdev)
|
||||
static int bfin_tdm_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct sport_device *sport_handle = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -307,7 +307,7 @@ static int __devexit bfin_tdm_remove(struct platform_device *pdev)
|
|||
|
||||
static struct platform_driver bfin_tdm_driver = {
|
||||
.probe = bfin_tdm_probe,
|
||||
.remove = __devexit_p(bfin_tdm_remove),
|
||||
.remove = bfin_tdm_remove,
|
||||
.driver = {
|
||||
.name = "bfin-tdm",
|
||||
.owner = THIS_MODULE,
|
||||
|
|
|
@ -186,7 +186,7 @@ static struct snd_soc_dai_driver bfin_i2s_dai = {
|
|||
.ops = &bfin_i2s_dai_ops,
|
||||
};
|
||||
|
||||
static int __devinit bfin_i2s_probe(struct platform_device *pdev)
|
||||
static int bfin_i2s_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sport_device *sport;
|
||||
struct device *dev = &pdev->dev;
|
||||
|
@ -208,7 +208,7 @@ static int __devinit bfin_i2s_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit bfin_i2s_remove(struct platform_device *pdev)
|
||||
static int bfin_i2s_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct sport_device *sport = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -220,7 +220,7 @@ static int __devexit bfin_i2s_remove(struct platform_device *pdev)
|
|||
|
||||
static struct platform_driver bfin_i2s_driver = {
|
||||
.probe = bfin_i2s_probe,
|
||||
.remove = __devexit_p(bfin_i2s_remove),
|
||||
.remove = bfin_i2s_remove,
|
||||
.driver = {
|
||||
.name = "bfin-i2s",
|
||||
.owner = THIS_MODULE,
|
||||
|
|
|
@ -157,7 +157,7 @@ static int bfin_eval_adau1373_probe(struct platform_device *pdev)
|
|||
return snd_soc_register_card(&bfin_eval_adau1373);
|
||||
}
|
||||
|
||||
static int __devexit bfin_eval_adau1373_remove(struct platform_device *pdev)
|
||||
static int bfin_eval_adau1373_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -173,7 +173,7 @@ static struct platform_driver bfin_eval_adau1373_driver = {
|
|||
.pm = &snd_soc_pm_ops,
|
||||
},
|
||||
.probe = bfin_eval_adau1373_probe,
|
||||
.remove = __devexit_p(bfin_eval_adau1373_remove),
|
||||
.remove = bfin_eval_adau1373_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bfin_eval_adau1373_driver);
|
||||
|
|
|
@ -97,7 +97,7 @@ static int bfin_eval_adau1701_probe(struct platform_device *pdev)
|
|||
return snd_soc_register_card(&bfin_eval_adau1701);
|
||||
}
|
||||
|
||||
static int __devexit bfin_eval_adau1701_remove(struct platform_device *pdev)
|
||||
static int bfin_eval_adau1701_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -113,7 +113,7 @@ static struct platform_driver bfin_eval_adau1701_driver = {
|
|||
.pm = &snd_soc_pm_ops,
|
||||
},
|
||||
.probe = bfin_eval_adau1701_probe,
|
||||
.remove = __devexit_p(bfin_eval_adau1701_remove),
|
||||
.remove = bfin_eval_adau1701_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bfin_eval_adau1701_driver);
|
||||
|
|
|
@ -122,7 +122,7 @@ static int bfin_eval_adav80x_probe(struct platform_device *pdev)
|
|||
return snd_soc_register_card(&bfin_eval_adav80x);
|
||||
}
|
||||
|
||||
static int __devexit bfin_eval_adav80x_remove(struct platform_device *pdev)
|
||||
static int bfin_eval_adav80x_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -145,7 +145,7 @@ static struct platform_driver bfin_eval_adav80x_driver = {
|
|||
.pm = &snd_soc_pm_ops,
|
||||
},
|
||||
.probe = bfin_eval_adav80x_probe,
|
||||
.remove = __devexit_p(bfin_eval_adav80x_remove),
|
||||
.remove = bfin_eval_adav80x_remove,
|
||||
.id_table = bfin_eval_adav80x_ids,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue