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

Commit 9ac8a712 authored by Bill Pemberton's avatar Bill Pemberton Committed by Mark Brown
Browse files

ASoC: s6000: 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 7ff60006

sound/soc/s6000/s6000-i2s.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -436,7 +436,7 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { 
	.ops = &s6000_i2s_dai_ops,

	.ops = &s6000_i2s_dai_ops,

};

};





static int __devinit s6000_i2s_probe(struct platform_device *pdev)

static int s6000_i2s_probe(struct platform_device *pdev)

{

{

	struct s6000_i2s_dev *dev;

	struct s6000_i2s_dev *dev;

	struct resource *scbmem, *sifmem, *region, *dma1, *dma2;

	struct resource *scbmem, *sifmem, *region, *dma1, *dma2;
@@ -566,7 +566,7 @@ static int __devinit s6000_i2s_probe(struct platform_device *pdev) 
	return ret;

	return ret;

}

}





static void __devexit s6000_i2s_remove(struct platform_device *pdev)

static void s6000_i2s_remove(struct platform_device *pdev)

{

{

	struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev);

	struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev);

	struct resource *region;

	struct resource *region;
@@ -597,7 +597,7 @@ static void __devexit s6000_i2s_remove(struct platform_device *pdev) 




static struct platform_driver s6000_i2s_driver = {

static struct platform_driver s6000_i2s_driver = {

	.probe  = s6000_i2s_probe,

	.probe  = s6000_i2s_probe,

	.remove = __devexit_p(s6000_i2s_remove),

	.remove = s6000_i2s_remove,

	.driver = {

	.driver = {

		.name   = "s6000-i2s",

		.name   = "s6000-i2s",

		.owner  = THIS_MODULE,

		.owner  = THIS_MODULE,

sound/soc/s6000/s6000-pcm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -500,12 +500,12 @@ static struct snd_soc_platform_driver s6000_soc_platform = { 
	.pcm_free = 	s6000_pcm_free,

	.pcm_free = 	s6000_pcm_free,

};

};





static int __devinit s6000_soc_platform_probe(struct platform_device *pdev)

static int s6000_soc_platform_probe(struct platform_device *pdev)

{

{

	return snd_soc_register_platform(&pdev->dev, &s6000_soc_platform);

	return snd_soc_register_platform(&pdev->dev, &s6000_soc_platform);

}

}





static int __devexit s6000_soc_platform_remove(struct platform_device *pdev)

static int s6000_soc_platform_remove(struct platform_device *pdev)

{

{

	snd_soc_unregister_platform(&pdev->dev);

	snd_soc_unregister_platform(&pdev->dev);

	return 0;

	return 0;
@@ -518,7 +518,7 @@ static struct platform_driver s6000_pcm_driver = { 
	},

	},





	.probe = s6000_soc_platform_probe,

	.probe = s6000_soc_platform_probe,

	.remove = __devexit_p(s6000_soc_platform_remove),

	.remove = s6000_soc_platform_remove,

};

};





module_platform_driver(s6000_pcm_driver);

module_platform_driver(s6000_pcm_driver);