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

ASoC: Samsung: 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 d7f1be84

sound/soc/samsung/ac97.c

+3 −3
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = { 
	},

};



static __devinit int s3c_ac97_probe(struct platform_device *pdev)

static int s3c_ac97_probe(struct platform_device *pdev)

{

	struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res;

	struct s3c_audio_pdata *ac97_pdata;
@@ -485,7 +485,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) 
	return ret;

}



static __devexit int s3c_ac97_remove(struct platform_device *pdev)

static int s3c_ac97_remove(struct platform_device *pdev)

{

	struct resource *mem_res, *irq_res;
@@ -510,7 +510,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev) 


static struct platform_driver s3c_ac97_driver = {

	.probe  = s3c_ac97_probe,

	.remove = __devexit_p(s3c_ac97_remove),

	.remove = s3c_ac97_remove,

	.driver = {

		.name = "samsung-ac97",

		.owner = THIS_MODULE,

sound/soc/samsung/bells.c

+3 −3
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static struct snd_soc_card bells_cards[] = { 
};





static __devinit int bells_probe(struct platform_device *pdev)

static int bells_probe(struct platform_device *pdev)

{

	int ret;
@@ -429,7 +429,7 @@ static __devinit int bells_probe(struct platform_device *pdev) 
	return 0;

}



static int __devexit bells_remove(struct platform_device *pdev)

static int bells_remove(struct platform_device *pdev)

{

	snd_soc_unregister_card(&bells_cards[pdev->id]);
@@ -443,7 +443,7 @@ static struct platform_driver bells_driver = { 
		.pm = &snd_soc_pm_ops,

	},

	.probe = bells_probe,

	.remove = __devexit_p(bells_remove),

	.remove = bells_remove,

};



module_platform_driver(bells_driver);

sound/soc/samsung/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -432,13 +432,13 @@ static struct snd_soc_platform_driver samsung_asoc_platform = { 
	.pcm_free	= dma_free_dma_buffers,

};



int __devinit asoc_dma_platform_register(struct device *dev)

int asoc_dma_platform_register(struct device *dev)

{

	return snd_soc_register_platform(dev, &samsung_asoc_platform);

}

EXPORT_SYMBOL_GPL(asoc_dma_platform_register);



void __devexit asoc_dma_platform_unregister(struct device *dev)

void asoc_dma_platform_unregister(struct device *dev)

{

	snd_soc_unregister_platform(dev);

}

sound/soc/samsung/i2s.c

+4 −5
Original line number Diff line number Diff line
@@ -952,8 +952,7 @@ static const struct snd_soc_dai_ops samsung_i2s_dai_ops = { 
					SNDRV_PCM_FMTBIT_S16_LE | \

					SNDRV_PCM_FMTBIT_S24_LE)



static __devinit

struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)

static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)

{

	struct i2s_dai *i2s;
@@ -994,7 +993,7 @@ struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) 
	return i2s;

}



static __devinit int samsung_i2s_probe(struct platform_device *pdev)

static int samsung_i2s_probe(struct platform_device *pdev)

{

	u32 dma_pl_chan, dma_cp_chan, dma_pl_sec_chan;

	struct i2s_dai *pri_dai, *sec_dai = NULL;
@@ -1117,7 +1116,7 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev) 
	return ret;

}



static __devexit int samsung_i2s_remove(struct platform_device *pdev)

static int samsung_i2s_remove(struct platform_device *pdev)

{

	struct i2s_dai *i2s, *other;

	struct resource *res;
@@ -1146,7 +1145,7 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev) 


static struct platform_driver samsung_i2s_driver = {

	.probe  = samsung_i2s_probe,

	.remove = __devexit_p(samsung_i2s_remove),

	.remove = samsung_i2s_remove,

	.driver = {

		.name = "samsung-i2s",

		.owner = THIS_MODULE,

sound/soc/samsung/idma.c

+3 −3
Original line number Diff line number Diff line
@@ -416,12 +416,12 @@ static struct snd_soc_platform_driver asoc_idma_platform = { 
	.pcm_free = idma_free,

};



static int __devinit asoc_idma_platform_probe(struct platform_device *pdev)

static int asoc_idma_platform_probe(struct platform_device *pdev)

{

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

}



static int __devexit asoc_idma_platform_remove(struct platform_device *pdev)

static int asoc_idma_platform_remove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);

	return 0;
@@ -434,7 +434,7 @@ static struct platform_driver asoc_idma_driver = { 
	},



	.probe = asoc_idma_platform_probe,

	.remove = __devexit_p(asoc_idma_platform_remove),

	.remove = asoc_idma_platform_remove,

};



module_platform_driver(asoc_idma_driver);