mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
ASoC: jz4740: 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
145e287956
commit
d6a29e3de0
@ -425,7 +425,7 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
|
|||||||
.resume = jz4740_i2s_resume,
|
.resume = jz4740_i2s_resume,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __devinit jz4740_i2s_dev_probe(struct platform_device *pdev)
|
static int jz4740_i2s_dev_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct jz4740_i2s *i2s;
|
struct jz4740_i2s *i2s;
|
||||||
int ret;
|
int ret;
|
||||||
@ -492,7 +492,7 @@ err_free:
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit jz4740_i2s_dev_remove(struct platform_device *pdev)
|
static int jz4740_i2s_dev_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct jz4740_i2s *i2s = platform_get_drvdata(pdev);
|
struct jz4740_i2s *i2s = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
@ -512,7 +512,7 @@ static int __devexit jz4740_i2s_dev_remove(struct platform_device *pdev)
|
|||||||
|
|
||||||
static struct platform_driver jz4740_i2s_driver = {
|
static struct platform_driver jz4740_i2s_driver = {
|
||||||
.probe = jz4740_i2s_dev_probe,
|
.probe = jz4740_i2s_dev_probe,
|
||||||
.remove = __devexit_p(jz4740_i2s_dev_remove),
|
.remove = jz4740_i2s_dev_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "jz4740-i2s",
|
.name = "jz4740-i2s",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
@ -335,12 +335,12 @@ static struct snd_soc_platform_driver jz4740_soc_platform = {
|
|||||||
.pcm_free = jz4740_pcm_free,
|
.pcm_free = jz4740_pcm_free,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __devinit jz4740_pcm_probe(struct platform_device *pdev)
|
static int jz4740_pcm_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
return snd_soc_register_platform(&pdev->dev, &jz4740_soc_platform);
|
return snd_soc_register_platform(&pdev->dev, &jz4740_soc_platform);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit jz4740_pcm_remove(struct platform_device *pdev)
|
static int jz4740_pcm_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
snd_soc_unregister_platform(&pdev->dev);
|
snd_soc_unregister_platform(&pdev->dev);
|
||||||
return 0;
|
return 0;
|
||||||
@ -348,7 +348,7 @@ static int __devexit jz4740_pcm_remove(struct platform_device *pdev)
|
|||||||
|
|
||||||
static struct platform_driver jz4740_pcm_driver = {
|
static struct platform_driver jz4740_pcm_driver = {
|
||||||
.probe = jz4740_pcm_probe,
|
.probe = jz4740_pcm_probe,
|
||||||
.remove = __devexit_p(jz4740_pcm_remove),
|
.remove = jz4740_pcm_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "jz4740-pcm-audio",
|
.name = "jz4740-pcm-audio",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
@ -96,7 +96,7 @@ static const struct gpio qi_lb60_gpios[] = {
|
|||||||
{ QI_LB60_AMP_GPIO, GPIOF_OUT_INIT_LOW, "AMP" },
|
{ QI_LB60_AMP_GPIO, GPIOF_OUT_INIT_LOW, "AMP" },
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __devinit qi_lb60_probe(struct platform_device *pdev)
|
static int qi_lb60_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct snd_soc_card *card = &qi_lb60;
|
struct snd_soc_card *card = &qi_lb60;
|
||||||
int ret;
|
int ret;
|
||||||
@ -116,7 +116,7 @@ static int __devinit qi_lb60_probe(struct platform_device *pdev)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit qi_lb60_remove(struct platform_device *pdev)
|
static int qi_lb60_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
@ -131,7 +131,7 @@ static struct platform_driver qi_lb60_driver = {
|
|||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.probe = qi_lb60_probe,
|
.probe = qi_lb60_probe,
|
||||||
.remove = __devexit_p(qi_lb60_remove),
|
.remove = qi_lb60_remove,
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(qi_lb60_driver);
|
module_platform_driver(qi_lb60_driver);
|
||||||
|
Loading…
Reference in New Issue
Block a user