Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/tegra/tegra20_das.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

sound/soc/tegra/tegra20_i2s.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

sound/soc/tegra/tegra20_spdif.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

sound/soc/tegra/tegra30_ahub.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

sound/soc/tegra/tegra30_i2s.c

+3 −3
Original line number Diff line number Diff line
@@ -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);