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

Commit 5c658be0 authored by Bill Pemberton's avatar Bill Pemberton Committed by Mark Brown
Browse files

ASoC: au1x: 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 71d14ea6

sound/soc/au1x/ac97c.c

+3 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static struct snd_soc_dai_driver au1xac97c_dai_driver = { 
	.ops			= &alchemy_ac97c_ops,

};



static int __devinit au1xac97c_drvprobe(struct platform_device *pdev)

static int au1xac97c_drvprobe(struct platform_device *pdev)

{

	int ret;

	struct resource *iores, *dmares;
@@ -276,7 +276,7 @@ static int __devinit au1xac97c_drvprobe(struct platform_device *pdev) 
	return 0;

}



static int __devexit au1xac97c_drvremove(struct platform_device *pdev)

static int au1xac97c_drvremove(struct platform_device *pdev)

{

	struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev);
@@ -330,7 +330,7 @@ static struct platform_driver au1xac97c_driver = { 
		.pm	= AU1XPSCAC97_PMOPS,

	},

	.probe		= au1xac97c_drvprobe,

	.remove		= __devexit_p(au1xac97c_drvremove),

	.remove		= au1xac97c_drvremove,

};



static int __init au1xac97c_load(void)

sound/soc/au1x/db1000.c

+3 −3
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ static struct snd_soc_card db1000_ac97 = { 
	.num_links	= 1,

};



static int __devinit db1000_audio_probe(struct platform_device *pdev)

static int db1000_audio_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card = &db1000_ac97;

	card->dev = &pdev->dev;

	return snd_soc_register_card(card);

}



static int __devexit db1000_audio_remove(struct platform_device *pdev)

static int db1000_audio_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	snd_soc_unregister_card(card);
@@ -55,7 +55,7 @@ static struct platform_driver db1000_audio_driver = { 
		.pm	= &snd_soc_pm_ops,

	},

	.probe		= db1000_audio_probe,

	.remove		= __devexit_p(db1000_audio_remove),

	.remove		= db1000_audio_remove,

};



module_platform_driver(db1000_audio_driver);

sound/soc/au1x/db1200.c

+4 −4
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static struct snd_soc_card db1550_i2s_machine = { 


/*-------------------------  COMMON PART  ---------------------------*/



static struct snd_soc_card *db1200_cards[] __devinitdata = {

static struct snd_soc_card *db1200_cards[] = {

	&db1200_ac97_machine,

	&db1200_i2s_machine,

	&db1300_ac97_machine,
@@ -176,7 +176,7 @@ static struct snd_soc_card *db1200_cards[] __devinitdata = { 
	&db1550_i2s_machine,

};



static int __devinit db1200_audio_probe(struct platform_device *pdev)

static int db1200_audio_probe(struct platform_device *pdev)

{

	const struct platform_device_id *pid = platform_get_device_id(pdev);

	struct snd_soc_card *card;
@@ -186,7 +186,7 @@ static int __devinit db1200_audio_probe(struct platform_device *pdev) 
	return snd_soc_register_card(card);

}



static int __devexit db1200_audio_remove(struct platform_device *pdev)

static int db1200_audio_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	snd_soc_unregister_card(card);
@@ -201,7 +201,7 @@ static struct platform_driver db1200_audio_driver = { 
	},

	.id_table	= db1200_pids,

	.probe		= db1200_audio_probe,

	.remove		= __devexit_p(db1200_audio_remove),

	.remove		= db1200_audio_remove,

};



module_platform_driver(db1200_audio_driver);

sound/soc/au1x/dbdma2.c

+3 −3
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static struct snd_soc_platform_driver au1xpsc_soc_platform = { 
	.pcm_free	= au1xpsc_pcm_free_dma_buffers,

};



static int __devinit au1xpsc_pcm_drvprobe(struct platform_device *pdev)

static int au1xpsc_pcm_drvprobe(struct platform_device *pdev)

{

	struct au1xpsc_audio_dmadata *dmadata;
@@ -362,7 +362,7 @@ static int __devinit au1xpsc_pcm_drvprobe(struct platform_device *pdev) 
	return snd_soc_register_platform(&pdev->dev, &au1xpsc_soc_platform);

}



static int __devexit au1xpsc_pcm_drvremove(struct platform_device *pdev)

static int au1xpsc_pcm_drvremove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);
@@ -375,7 +375,7 @@ static struct platform_driver au1xpsc_pcm_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= au1xpsc_pcm_drvprobe,

	.remove		= __devexit_p(au1xpsc_pcm_drvremove),

	.remove		= au1xpsc_pcm_drvremove,

};



module_platform_driver(au1xpsc_pcm_driver);

sound/soc/au1x/dma.c

+3 −3
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static struct snd_soc_platform_driver alchemy_pcm_soc_platform = { 
	.pcm_free	= alchemy_pcm_free_dma_buffers,

};



static int __devinit alchemy_pcm_drvprobe(struct platform_device *pdev)

static int alchemy_pcm_drvprobe(struct platform_device *pdev)

{

	struct alchemy_pcm_ctx *ctx;
@@ -335,7 +335,7 @@ static int __devinit alchemy_pcm_drvprobe(struct platform_device *pdev) 
	return snd_soc_register_platform(&pdev->dev, &alchemy_pcm_soc_platform);

}



static int __devexit alchemy_pcm_drvremove(struct platform_device *pdev)

static int alchemy_pcm_drvremove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);
@@ -348,7 +348,7 @@ static struct platform_driver alchemy_pcmdma_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= alchemy_pcm_drvprobe,

	.remove		= __devexit_p(alchemy_pcm_drvremove),

	.remove		= alchemy_pcm_drvremove,

};



module_platform_driver(alchemy_pcmdma_driver);