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

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

ASoC: sh: 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 9ac8a712

sound/soc/sh/dma-sh7760.c

+3 −3
Original line number Diff line number Diff line
@@ -348,12 +348,12 @@ static struct snd_soc_platform sh7760_soc_platform = { 
	.pcm_free	= camelot_pcm_free,

};



static int __devinit sh7760_soc_platform_probe(struct platform_device *pdev)

static int sh7760_soc_platform_probe(struct platform_device *pdev)

{

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

}



static int __devexit sh7760_soc_platform_remove(struct platform_device *pdev)

static int sh7760_soc_platform_remove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);

	return 0;
@@ -366,7 +366,7 @@ static struct platform_driver sh7760_pcm_driver = { 
	},



	.probe = sh7760_soc_platform_probe,

	.remove = __devexit_p(sh7760_soc_platform_remove),

	.remove = sh7760_soc_platform_remove,

};



module_platform_driver(sh7760_pcm_driver);

sound/soc/sh/hac.c

+3 −3
Original line number Diff line number Diff line
@@ -310,13 +310,13 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = { 
#endif

};



static int __devinit hac_soc_platform_probe(struct platform_device *pdev)

static int hac_soc_platform_probe(struct platform_device *pdev)

{

	return snd_soc_register_dais(&pdev->dev, sh4_hac_dai,

			ARRAY_SIZE(sh4_hac_dai));

}



static int __devexit hac_soc_platform_remove(struct platform_device *pdev)

static int hac_soc_platform_remove(struct platform_device *pdev)

{

	snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_hac_dai));

	return 0;
@@ -329,7 +329,7 @@ static struct platform_driver hac_pcm_driver = { 
	},



	.probe = hac_soc_platform_probe,

	.remove = __devexit_p(hac_soc_platform_remove),

	.remove = hac_soc_platform_remove,

};



module_platform_driver(hac_pcm_driver);

sound/soc/sh/siu_dai.c

+3 −3
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static struct snd_soc_dai_driver siu_i2s_dai = { 
	.ops = &siu_dai_ops,

};



static int __devinit siu_probe(struct platform_device *pdev)

static int siu_probe(struct platform_device *pdev)

{

	const struct firmware *fw_entry;

	struct resource *res, *region;
@@ -815,7 +815,7 @@ static int __devinit siu_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit siu_remove(struct platform_device *pdev)

static int siu_remove(struct platform_device *pdev)

{

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

	struct resource *res;
@@ -843,7 +843,7 @@ static struct platform_driver siu_driver = { 
		.name	= "siu-pcm-audio",

	},

	.probe		= siu_probe,

	.remove		= __devexit_p(siu_remove),

	.remove		= siu_remove,

};



module_platform_driver(siu_driver);

sound/soc/sh/ssi.c

+3 −3
Original line number Diff line number Diff line
@@ -379,13 +379,13 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = { 
#endif

};



static int __devinit sh4_soc_dai_probe(struct platform_device *pdev)

static int sh4_soc_dai_probe(struct platform_device *pdev)

{

	return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai,

			ARRAY_SIZE(sh4_ssi_dai));

}



static int __devexit sh4_soc_dai_remove(struct platform_device *pdev)

static int sh4_soc_dai_remove(struct platform_device *pdev)

{

	snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));

	return 0;
@@ -398,7 +398,7 @@ static struct platform_driver sh4_ssi_driver = { 
	},



	.probe = sh4_soc_dai_probe,

	.remove = __devexit_p(sh4_soc_dai_remove),

	.remove = sh4_soc_dai_remove,

};



module_platform_driver(sh4_ssi_driver);