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

ASoC: tegra: 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:33 -05:00 committed by Mark Brown
parent 468c11754b
commit 4652a0d0c4
10 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/tegra/tegra20_das.c
View File

@ -131,7 +131,7 @@ static const struct regmap_config tegra20_das_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit tegra20_das_probe(struct platform_device *pdev)
static int tegra20_das_probe(struct platform_device *pdev)
{
struct resource *res, *region;
void __iomem *regs;
@ -200,7 +200,7 @@ static int __devinit tegra20_das_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra20_das_remove(struct platform_device *pdev)
static int tegra20_das_remove(struct platform_device *pdev)
{
if (!das)
return -ENODEV;
@ -217,7 +217,7 @@ static const struct of_device_id tegra20_das_of_match[] = {
static struct platform_driver tegra20_das_driver = {
.probe = tegra20_das_probe,
.remove = __devexit_p(tegra20_das_remove),
.remove = tegra20_das_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,

6
sound/soc/tegra/tegra20_i2s.c
View File

@ -331,7 +331,7 @@ static const struct regmap_config tegra20_i2s_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static __devinit int tegra20_i2s_platform_probe(struct platform_device *pdev)
static int tegra20_i2s_platform_probe(struct platform_device *pdev)
{
struct tegra20_i2s *i2s;
struct resource *mem, *memregion, *dmareq;
@ -447,7 +447,7 @@ static __devinit int tegra20_i2s_platform_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra20_i2s_platform_remove(struct platform_device *pdev)
static int tegra20_i2s_platform_remove(struct platform_device *pdev)
{
struct tegra20_i2s *i2s = dev_get_drvdata(&pdev->dev);
@ -481,7 +481,7 @@ static struct platform_driver tegra20_i2s_driver = {
.pm = &tegra20_i2s_pm_ops,
},
.probe = tegra20_i2s_platform_probe,
.remove = __devexit_p(tegra20_i2s_platform_remove),
.remove = tegra20_i2s_platform_remove,
};
module_platform_driver(tegra20_i2s_driver);

6
sound/soc/tegra/tegra20_spdif.c
View File

@ -257,7 +257,7 @@ static const struct regmap_config tegra20_spdif_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static __devinit int tegra20_spdif_platform_probe(struct platform_device *pdev)
static int tegra20_spdif_platform_probe(struct platform_device *pdev)
{
struct tegra20_spdif *spdif;
struct resource *mem, *memregion, *dmareq;
@ -357,7 +357,7 @@ static __devinit int tegra20_spdif_platform_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra20_spdif_platform_remove(struct platform_device *pdev)
static int tegra20_spdif_platform_remove(struct platform_device *pdev)
{
struct tegra20_spdif *spdif = dev_get_drvdata(&pdev->dev);
@ -385,7 +385,7 @@ static struct platform_driver tegra20_spdif_driver = {
.pm = &tegra20_spdif_pm_ops,
},
.probe = tegra20_spdif_platform_probe,
.remove = __devexit_p(tegra20_spdif_platform_remove),
.remove = tegra20_spdif_platform_remove,
};
module_platform_driver(tegra20_spdif_driver);

8
sound/soc/tegra/tegra30_ahub.c
View File

@ -300,7 +300,7 @@ static const char * const configlink_clocks[] = {
"spdif_in",
};
struct of_dev_auxdata ahub_auxdata[] __devinitdata = {
struct of_dev_auxdata ahub_auxdata[] = {
OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080300, "tegra30-i2s.0", NULL),
OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080400, "tegra30-i2s.1", NULL),
OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080500, "tegra30-i2s.2", NULL),
@ -434,7 +434,7 @@ static const struct regmap_config tegra30_ahub_ahub_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit tegra30_ahub_probe(struct platform_device *pdev)
static int tegra30_ahub_probe(struct platform_device *pdev)
{
struct clk *clk;
int i;
@ -586,7 +586,7 @@ static int __devinit tegra30_ahub_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra30_ahub_remove(struct platform_device *pdev)
static int tegra30_ahub_remove(struct platform_device *pdev)
{
if (!ahub)
return -ENODEV;
@ -615,7 +615,7 @@ static const struct dev_pm_ops tegra30_ahub_pm_ops = {
static struct platform_driver tegra30_ahub_driver = {
.probe = tegra30_ahub_probe,
.remove = __devexit_p(tegra30_ahub_remove),
.remove = tegra30_ahub_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,

6
sound/soc/tegra/tegra30_i2s.c
View File

@ -391,7 +391,7 @@ static const struct regmap_config tegra30_i2s_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static __devinit int tegra30_i2s_platform_probe(struct platform_device *pdev)
static int tegra30_i2s_platform_probe(struct platform_device *pdev)
{
struct tegra30_i2s *i2s;
u32 cif_ids[2];
@ -492,7 +492,7 @@ static __devinit int tegra30_i2s_platform_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra30_i2s_platform_remove(struct platform_device *pdev)
static int tegra30_i2s_platform_remove(struct platform_device *pdev)
{
struct tegra30_i2s *i2s = dev_get_drvdata(&pdev->dev);
@ -526,7 +526,7 @@ static struct platform_driver tegra30_i2s_driver = {
.pm = &tegra30_i2s_pm_ops,
},
.probe = tegra30_i2s_platform_probe,
.remove = __devexit_p(tegra30_i2s_platform_remove),
.remove = tegra30_i2s_platform_remove,
};
module_platform_driver(tegra30_i2s_driver);

6
sound/soc/tegra/tegra_alc5632.c
View File

@ -150,7 +150,7 @@ static struct snd_soc_card snd_soc_tegra_alc5632 = {
.fully_routed = true,
};
static __devinit int tegra_alc5632_probe(struct platform_device *pdev)
static int tegra_alc5632_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct snd_soc_card *card = &snd_soc_tegra_alc5632;
@ -227,7 +227,7 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra_alc5632_remove(struct platform_device *pdev)
static int tegra_alc5632_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);
@ -255,7 +255,7 @@ static struct platform_driver tegra_alc5632_driver = {
.of_match_table = tegra_alc5632_of_match,
},
.probe = tegra_alc5632_probe,
.remove = __devexit_p(tegra_alc5632_remove),
.remove = tegra_alc5632_remove,
};
module_platform_driver(tegra_alc5632_driver);

4
sound/soc/tegra/tegra_pcm.c
View File

@ -253,13 +253,13 @@ static struct snd_soc_platform_driver tegra_pcm_platform = {
.pcm_free = tegra_pcm_free,
};
int __devinit tegra_pcm_platform_register(struct device *dev)
int tegra_pcm_platform_register(struct device *dev)
{
return snd_soc_register_platform(dev, &tegra_pcm_platform);
}
EXPORT_SYMBOL_GPL(tegra_pcm_platform_register);
void __devexit tegra_pcm_platform_unregister(struct device *dev)
void tegra_pcm_platform_unregister(struct device *dev)
{
snd_soc_unregister_platform(dev);
}

6
sound/soc/tegra/tegra_wm8753.c
View File

@ -122,7 +122,7 @@ static struct snd_soc_card snd_soc_tegra_wm8753 = {
.fully_routed = true,
};
static __devinit int tegra_wm8753_driver_probe(struct platform_device *pdev)
static int tegra_wm8753_driver_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &snd_soc_tegra_wm8753;
struct tegra_wm8753 *machine;
@ -188,7 +188,7 @@ static __devinit int tegra_wm8753_driver_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra_wm8753_driver_remove(struct platform_device *pdev)
static int tegra_wm8753_driver_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card);
@ -213,7 +213,7 @@ static struct platform_driver tegra_wm8753_driver = {
.of_match_table = tegra_wm8753_of_match,
},
.probe = tegra_wm8753_driver_probe,
.remove = __devexit_p(tegra_wm8753_driver_remove),
.remove = tegra_wm8753_driver_remove,
};
module_platform_driver(tegra_wm8753_driver);

6
sound/soc/tegra/tegra_wm8903.c
View File

@ -252,7 +252,7 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = {
.fully_routed = true,
};
static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
static int tegra_wm8903_driver_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct snd_soc_card *card = &snd_soc_tegra_wm8903;
@ -402,7 +402,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
static int tegra_wm8903_driver_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
@ -430,7 +430,7 @@ static struct platform_driver tegra_wm8903_driver = {
.of_match_table = tegra_wm8903_of_match,
},
.probe = tegra_wm8903_driver_probe,
.remove = __devexit_p(tegra_wm8903_driver_remove),
.remove = tegra_wm8903_driver_remove,
};
module_platform_driver(tegra_wm8903_driver);

6
sound/soc/tegra/trimslice.c
View File

@ -120,7 +120,7 @@ static struct snd_soc_card snd_soc_trimslice = {
.fully_routed = true,
};
static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)
static int tegra_snd_trimslice_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &snd_soc_trimslice;
struct tegra_trimslice *trimslice;
@ -183,7 +183,7 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)
return ret;
}
static int __devexit tegra_snd_trimslice_remove(struct platform_device *pdev)
static int tegra_snd_trimslice_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card);
@ -208,7 +208,7 @@ static struct platform_driver tegra_snd_trimslice_driver = {
.of_match_table = trimslice_of_match,
},
.probe = tegra_snd_trimslice_probe,
.remove = __devexit_p(tegra_snd_trimslice_remove),
.remove = tegra_snd_trimslice_remove,
};
module_platform_driver(tegra_snd_trimslice_driver);