Commit 4652a0d0 authored by Bill Pemberton's avatar Bill Pemberton Committed by Mark Brown

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 468c1175
...@@ -131,7 +131,7 @@ static const struct regmap_config tegra20_das_regmap_config = { ...@@ -131,7 +131,7 @@ static const struct regmap_config tegra20_das_regmap_config = {
.cache_type = REGCACHE_RBTREE, .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; struct resource *res, *region;
void __iomem *regs; void __iomem *regs;
...@@ -200,7 +200,7 @@ static int __devinit tegra20_das_probe(struct platform_device *pdev) ...@@ -200,7 +200,7 @@ static int __devinit tegra20_das_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tegra20_das_remove(struct platform_device *pdev) static int tegra20_das_remove(struct platform_device *pdev)
{ {
if (!das) if (!das)
return -ENODEV; return -ENODEV;
...@@ -217,7 +217,7 @@ static const struct of_device_id tegra20_das_of_match[] = { ...@@ -217,7 +217,7 @@ static const struct of_device_id tegra20_das_of_match[] = {
static struct platform_driver tegra20_das_driver = { static struct platform_driver tegra20_das_driver = {
.probe = tegra20_das_probe, .probe = tegra20_das_probe,
.remove = __devexit_p(tegra20_das_remove), .remove = tegra20_das_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -331,7 +331,7 @@ static const struct regmap_config tegra20_i2s_regmap_config = { ...@@ -331,7 +331,7 @@ static const struct regmap_config tegra20_i2s_regmap_config = {
.cache_type = REGCACHE_RBTREE, .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 tegra20_i2s *i2s;
struct resource *mem, *memregion, *dmareq; struct resource *mem, *memregion, *dmareq;
...@@ -447,7 +447,7 @@ static __devinit int tegra20_i2s_platform_probe(struct platform_device *pdev) ...@@ -447,7 +447,7 @@ static __devinit int tegra20_i2s_platform_probe(struct platform_device *pdev)
return ret; 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); struct tegra20_i2s *i2s = dev_get_drvdata(&pdev->dev);
...@@ -481,7 +481,7 @@ static struct platform_driver tegra20_i2s_driver = { ...@@ -481,7 +481,7 @@ static struct platform_driver tegra20_i2s_driver = {
.pm = &tegra20_i2s_pm_ops, .pm = &tegra20_i2s_pm_ops,
}, },
.probe = tegra20_i2s_platform_probe, .probe = tegra20_i2s_platform_probe,
.remove = __devexit_p(tegra20_i2s_platform_remove), .remove = tegra20_i2s_platform_remove,
}; };
module_platform_driver(tegra20_i2s_driver); module_platform_driver(tegra20_i2s_driver);
......
...@@ -257,7 +257,7 @@ static const struct regmap_config tegra20_spdif_regmap_config = { ...@@ -257,7 +257,7 @@ static const struct regmap_config tegra20_spdif_regmap_config = {
.cache_type = REGCACHE_RBTREE, .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 tegra20_spdif *spdif;
struct resource *mem, *memregion, *dmareq; struct resource *mem, *memregion, *dmareq;
...@@ -357,7 +357,7 @@ static __devinit int tegra20_spdif_platform_probe(struct platform_device *pdev) ...@@ -357,7 +357,7 @@ static __devinit int tegra20_spdif_platform_probe(struct platform_device *pdev)
return ret; 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); struct tegra20_spdif *spdif = dev_get_drvdata(&pdev->dev);
...@@ -385,7 +385,7 @@ static struct platform_driver tegra20_spdif_driver = { ...@@ -385,7 +385,7 @@ static struct platform_driver tegra20_spdif_driver = {
.pm = &tegra20_spdif_pm_ops, .pm = &tegra20_spdif_pm_ops,
}, },
.probe = tegra20_spdif_platform_probe, .probe = tegra20_spdif_platform_probe,
.remove = __devexit_p(tegra20_spdif_platform_remove), .remove = tegra20_spdif_platform_remove,
}; };
module_platform_driver(tegra20_spdif_driver); module_platform_driver(tegra20_spdif_driver);
......
...@@ -300,7 +300,7 @@ static const char * const configlink_clocks[] = { ...@@ -300,7 +300,7 @@ static const char * const configlink_clocks[] = {
"spdif_in", "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", 0x70080300, "tegra30-i2s.0", NULL),
OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080400, "tegra30-i2s.1", NULL), OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080400, "tegra30-i2s.1", NULL),
OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080500, "tegra30-i2s.2", 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 = { ...@@ -434,7 +434,7 @@ static const struct regmap_config tegra30_ahub_ahub_regmap_config = {
.cache_type = REGCACHE_RBTREE, .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; struct clk *clk;
int i; int i;
...@@ -586,7 +586,7 @@ static int __devinit tegra30_ahub_probe(struct platform_device *pdev) ...@@ -586,7 +586,7 @@ static int __devinit tegra30_ahub_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tegra30_ahub_remove(struct platform_device *pdev) static int tegra30_ahub_remove(struct platform_device *pdev)
{ {
if (!ahub) if (!ahub)
return -ENODEV; return -ENODEV;
...@@ -615,7 +615,7 @@ static const struct dev_pm_ops tegra30_ahub_pm_ops = { ...@@ -615,7 +615,7 @@ static const struct dev_pm_ops tegra30_ahub_pm_ops = {
static struct platform_driver tegra30_ahub_driver = { static struct platform_driver tegra30_ahub_driver = {
.probe = tegra30_ahub_probe, .probe = tegra30_ahub_probe,
.remove = __devexit_p(tegra30_ahub_remove), .remove = tegra30_ahub_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -391,7 +391,7 @@ static const struct regmap_config tegra30_i2s_regmap_config = { ...@@ -391,7 +391,7 @@ static const struct regmap_config tegra30_i2s_regmap_config = {
.cache_type = REGCACHE_RBTREE, .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; struct tegra30_i2s *i2s;
u32 cif_ids[2]; u32 cif_ids[2];
...@@ -492,7 +492,7 @@ static __devinit int tegra30_i2s_platform_probe(struct platform_device *pdev) ...@@ -492,7 +492,7 @@ static __devinit int tegra30_i2s_platform_probe(struct platform_device *pdev)
return ret; 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); struct tegra30_i2s *i2s = dev_get_drvdata(&pdev->dev);
...@@ -526,7 +526,7 @@ static struct platform_driver tegra30_i2s_driver = { ...@@ -526,7 +526,7 @@ static struct platform_driver tegra30_i2s_driver = {
.pm = &tegra30_i2s_pm_ops, .pm = &tegra30_i2s_pm_ops,
}, },
.probe = tegra30_i2s_platform_probe, .probe = tegra30_i2s_platform_probe,
.remove = __devexit_p(tegra30_i2s_platform_remove), .remove = tegra30_i2s_platform_remove,
}; };
module_platform_driver(tegra30_i2s_driver); module_platform_driver(tegra30_i2s_driver);
......
...@@ -150,7 +150,7 @@ static struct snd_soc_card snd_soc_tegra_alc5632 = { ...@@ -150,7 +150,7 @@ static struct snd_soc_card snd_soc_tegra_alc5632 = {
.fully_routed = true, .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 device_node *np = pdev->dev.of_node;
struct snd_soc_card *card = &snd_soc_tegra_alc5632; struct snd_soc_card *card = &snd_soc_tegra_alc5632;
...@@ -227,7 +227,7 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev) ...@@ -227,7 +227,7 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev)
return ret; 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 snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card); struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);
...@@ -255,7 +255,7 @@ static struct platform_driver tegra_alc5632_driver = { ...@@ -255,7 +255,7 @@ static struct platform_driver tegra_alc5632_driver = {
.of_match_table = tegra_alc5632_of_match, .of_match_table = tegra_alc5632_of_match,
}, },
.probe = tegra_alc5632_probe, .probe = tegra_alc5632_probe,
.remove = __devexit_p(tegra_alc5632_remove), .remove = tegra_alc5632_remove,
}; };
module_platform_driver(tegra_alc5632_driver); module_platform_driver(tegra_alc5632_driver);
......
...@@ -253,13 +253,13 @@ static struct snd_soc_platform_driver tegra_pcm_platform = { ...@@ -253,13 +253,13 @@ static struct snd_soc_platform_driver tegra_pcm_platform = {
.pcm_free = tegra_pcm_free, .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); return snd_soc_register_platform(dev, &tegra_pcm_platform);
} }
EXPORT_SYMBOL_GPL(tegra_pcm_platform_register); 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); snd_soc_unregister_platform(dev);
} }
......
...@@ -122,7 +122,7 @@ static struct snd_soc_card snd_soc_tegra_wm8753 = { ...@@ -122,7 +122,7 @@ static struct snd_soc_card snd_soc_tegra_wm8753 = {
.fully_routed = true, .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 snd_soc_card *card = &snd_soc_tegra_wm8753;
struct tegra_wm8753 *machine; struct tegra_wm8753 *machine;
...@@ -188,7 +188,7 @@ static __devinit int tegra_wm8753_driver_probe(struct platform_device *pdev) ...@@ -188,7 +188,7 @@ static __devinit int tegra_wm8753_driver_probe(struct platform_device *pdev)
return ret; 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 snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card); struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card);
...@@ -213,7 +213,7 @@ static struct platform_driver tegra_wm8753_driver = { ...@@ -213,7 +213,7 @@ static struct platform_driver tegra_wm8753_driver = {
.of_match_table = tegra_wm8753_of_match, .of_match_table = tegra_wm8753_of_match,
}, },
.probe = tegra_wm8753_driver_probe, .probe = tegra_wm8753_driver_probe,
.remove = __devexit_p(tegra_wm8753_driver_remove), .remove = tegra_wm8753_driver_remove,
}; };
module_platform_driver(tegra_wm8753_driver); module_platform_driver(tegra_wm8753_driver);
......
...@@ -252,7 +252,7 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = { ...@@ -252,7 +252,7 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = {
.fully_routed = true, .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 device_node *np = pdev->dev.of_node;
struct snd_soc_card *card = &snd_soc_tegra_wm8903; struct snd_soc_card *card = &snd_soc_tegra_wm8903;
...@@ -402,7 +402,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) ...@@ -402,7 +402,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
return ret; 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 snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
...@@ -430,7 +430,7 @@ static struct platform_driver tegra_wm8903_driver = { ...@@ -430,7 +430,7 @@ static struct platform_driver tegra_wm8903_driver = {
.of_match_table = tegra_wm8903_of_match, .of_match_table = tegra_wm8903_of_match,
}, },
.probe = tegra_wm8903_driver_probe, .probe = tegra_wm8903_driver_probe,
.remove = __devexit_p(tegra_wm8903_driver_remove), .remove = tegra_wm8903_driver_remove,
}; };
module_platform_driver(tegra_wm8903_driver); module_platform_driver(tegra_wm8903_driver);
......
...@@ -120,7 +120,7 @@ static struct snd_soc_card snd_soc_trimslice = { ...@@ -120,7 +120,7 @@ static struct snd_soc_card snd_soc_trimslice = {
.fully_routed = true, .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 snd_soc_card *card = &snd_soc_trimslice;
struct tegra_trimslice *trimslice; struct tegra_trimslice *trimslice;
...@@ -183,7 +183,7 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev) ...@@ -183,7 +183,7 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)
return ret; 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 snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card); struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card);
...@@ -208,7 +208,7 @@ static struct platform_driver tegra_snd_trimslice_driver = { ...@@ -208,7 +208,7 @@ static struct platform_driver tegra_snd_trimslice_driver = {
.of_match_table = trimslice_of_match, .of_match_table = trimslice_of_match,
}, },
.probe = tegra_snd_trimslice_probe, .probe = tegra_snd_trimslice_probe,
.remove = __devexit_p(tegra_snd_trimslice_remove), .remove = tegra_snd_trimslice_remove,
}; };
module_platform_driver(tegra_snd_trimslice_driver); module_platform_driver(tegra_snd_trimslice_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment