From c9b3a40ff2b3dea9914e36965a17c802650bb603 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 10 Dec 2008 07:47:22 +0100
Subject: [PATCH] ALSA: ASoC - Fix wrong section types

The module init entries should be __init instead of __devinit.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/atmel/atmel-pcm.c         | 2 +-
 sound/soc/atmel/atmel_ssc_dai.c     | 2 +-
 sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +-
 sound/soc/blackfin/bf5xx-ac97.c     | 2 +-
 sound/soc/blackfin/bf5xx-i2s-pcm.c  | 2 +-
 sound/soc/blackfin/bf5xx-i2s.c      | 2 +-
 sound/soc/codecs/ad73311.c          | 2 +-
 sound/soc/codecs/ak4535.c           | 2 +-
 sound/soc/codecs/cs4270.c           | 2 +-
 sound/soc/codecs/pcm3008.c          | 2 +-
 sound/soc/codecs/ssm2602.c          | 2 +-
 sound/soc/codecs/tlv320aic23.c      | 2 +-
 sound/soc/codecs/tlv320aic3x.c      | 2 +-
 sound/soc/codecs/uda134x.c          | 2 +-
 sound/soc/codecs/uda1380.c          | 2 +-
 sound/soc/codecs/wm8510.c           | 2 +-
 sound/soc/codecs/wm8580.c           | 2 +-
 sound/soc/codecs/wm8728.c           | 2 +-
 sound/soc/codecs/wm8731.c           | 2 +-
 sound/soc/codecs/wm8750.c           | 2 +-
 sound/soc/codecs/wm8753.c           | 2 +-
 sound/soc/codecs/wm8900.c           | 2 +-
 sound/soc/codecs/wm8903.c           | 2 +-
 sound/soc/codecs/wm8971.c           | 2 +-
 sound/soc/codecs/wm8990.c           | 2 +-
 sound/soc/davinci/davinci-i2s.c     | 2 +-
 sound/soc/davinci/davinci-pcm.c     | 2 +-
 sound/soc/fsl/fsl_dma.c             | 2 +-
 sound/soc/omap/omap-mcbsp.c         | 2 +-
 sound/soc/omap/omap-pcm.c           | 2 +-
 sound/soc/pxa/pxa-ssp.c             | 2 +-
 sound/soc/pxa/pxa2xx-ac97.c         | 2 +-
 sound/soc/pxa/pxa2xx-pcm.c          | 2 +-
 sound/soc/s3c24xx/s3c2412-i2s.c     | 2 +-
 sound/soc/s3c24xx/s3c2443-ac97.c    | 2 +-
 sound/soc/s3c24xx/s3c24xx-i2s.c     | 2 +-
 sound/soc/s3c24xx/s3c24xx-pcm.c     | 2 +-
 sound/soc/sh/dma-sh7760.c           | 2 +-
 sound/soc/sh/hac.c                  | 2 +-
 sound/soc/sh/ssi.c                  | 2 +-
 sound/soc/soc-core.c                | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
index 027eb13f9dd0..1fac5efd285b 100644
--- a/sound/soc/atmel/atmel-pcm.c
+++ b/sound/soc/atmel/atmel-pcm.c
@@ -477,7 +477,7 @@ struct snd_soc_platform atmel_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(atmel_soc_platform);
 
-static int __devinit atmel_pcm_modinit(void)
+static int __init atmel_pcm_modinit(void)
 {
 	return snd_soc_register_platform(&atmel_soc_platform);
 }
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 87904b6ab8c2..c5d67900d666 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -772,7 +772,7 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
 };
 EXPORT_SYMBOL_GPL(atmel_ssc_dai);
 
-static int __devinit atmel_ssc_modinit(void)
+static int __init atmel_ssc_modinit(void)
 {
 	return snd_soc_register_dais(atmel_ssc_dai, ARRAY_SIZE(atmel_ssc_dai));
 }
diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c
index 5b27e0d9d0ec..8067cfafa3a7 100644
--- a/sound/soc/blackfin/bf5xx-ac97-pcm.c
+++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c
@@ -451,7 +451,7 @@ struct snd_soc_platform bf5xx_ac97_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(bf5xx_ac97_soc_platform);
 
-static int __devinit bfin_ac97_init(void)
+static int __init bfin_ac97_init(void)
 {
 	return snd_soc_register_platform(&bf5xx_ac97_soc_platform);
 }
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index ad3efeeb6d44..3be2be60576d 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -431,7 +431,7 @@ struct snd_soc_dai bfin_ac97_dai = {
 };
 EXPORT_SYMBOL_GPL(bfin_ac97_dai);
 
-static int __devinit bfin_ac97_init(void)
+static int __init bfin_ac97_init(void)
 {
 	return snd_soc_register_dai(&bfin_ac97_dai);
 }
diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c
index c58b12a44870..53d290b3ea47 100644
--- a/sound/soc/blackfin/bf5xx-i2s-pcm.c
+++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c
@@ -283,7 +283,7 @@ struct snd_soc_platform bf5xx_i2s_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(bf5xx_i2s_soc_platform);
 
-static int __devinit bfin_i2s_init(void)
+static int __init bfin_i2s_init(void)
 {
 	return snd_soc_register_platform(&bf5xx_i2s_soc_platform);
 }
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index 0d58d2b6db6a..c17b131f6626 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -313,7 +313,7 @@ struct snd_soc_dai bf5xx_i2s_dai = {
 };
 EXPORT_SYMBOL_GPL(bf5xx_i2s_dai);
 
-static int __devinit bfin_i2s_init(void)
+static int __init bfin_i2s_init(void)
 {
 	return snd_soc_register_dai(&bfin_i2s_dai);
 }
diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c
index e32f55034e64..b09289a1e55a 100644
--- a/sound/soc/codecs/ad73311.c
+++ b/sound/soc/codecs/ad73311.c
@@ -98,7 +98,7 @@ struct snd_soc_codec_device soc_codec_dev_ad73311 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_ad73311);
 
-static int __devinit ad73311_init(void)
+static int __init ad73311_init(void)
 {
 	return snd_soc_register_dai(&ad73311_dai);
 }
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index 94148fba9119..81300d8d42ca 100644
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -688,7 +688,7 @@ struct snd_soc_codec_device soc_codec_dev_ak4535 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_ak4535);
 
-static int __devinit ak4535_modinit(void)
+static int __init ak4535_modinit(void)
 {
 	return snd_soc_register_dai(&ak4535_dai);
 }
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 73aaf249d782..f1aa0c34421c 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -774,7 +774,7 @@ struct snd_soc_codec_device soc_codec_device_cs4270 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_device_cs4270);
 
-static int __devinit cs4270_init(void)
+static int __init cs4270_init(void)
 {
 	return snd_soc_register_dai(&cs4270_dai);
 }
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index f333e88ee255..9a3e67e5319c 100644
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -195,7 +195,7 @@ struct snd_soc_codec_device soc_codec_dev_pcm3008 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_pcm3008);
 
-static int __devinit pcm3008_init(void)
+static int __init pcm3008_init(void)
 {
 	return snd_soc_register_dai(&pcm3008_dai);
 }
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 77fdcb4b9a1b..2325aefea411 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -793,7 +793,7 @@ struct snd_soc_codec_device soc_codec_dev_ssm2602 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_ssm2602);
 
-static int __devinit ssm2602_modinit(void)
+static int __init ssm2602_modinit(void)
 {
 	return snd_soc_register_dai(&ssm2602_dai);
 }
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index eac449b92bd5..39f5b981d25a 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -847,7 +847,7 @@ struct snd_soc_codec_device soc_codec_dev_tlv320aic23 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_tlv320aic23);
 
-static int __devinit tlv320aic23_modinit(void)
+static int __init tlv320aic23_modinit(void)
 {
 	return snd_soc_register_dai(&tlv320aic23_dai);
 }
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index ccd575961869..8da9e5d2e2fb 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1411,7 +1411,7 @@ struct snd_soc_codec_device soc_codec_dev_aic3x = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_aic3x);
 
-static int __devinit aic3x_modinit(void)
+static int __init aic3x_modinit(void)
 {
 	return snd_soc_register_dai(&aic3x_dai);
 }
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index 8e035b5d733f..a2c5064a774b 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -651,7 +651,7 @@ struct snd_soc_codec_device soc_codec_dev_uda134x = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_uda134x);
 
-static int __devinit uda134x_init(void)
+static int __init uda134x_init(void)
 {
 	return snd_soc_register_dai(&uda134x_dai);
 }
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 55a99b6a68a1..e6bf0844fbf3 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -841,7 +841,7 @@ struct snd_soc_codec_device soc_codec_dev_uda1380 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_uda1380);
 
-static int __devinit uda1380_modinit(void)
+static int __init uda1380_modinit(void)
 {
 	return snd_soc_register_dais(uda1380_dai, ARRAY_SIZE(uda1380_dai));
 }
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index a2af04bb4e9f..40f8238df717 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -889,7 +889,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8510 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8510);
 
-static int __devinit wm8510_modinit(void)
+static int __init wm8510_modinit(void)
 {
 	return snd_soc_register_dai(&wm8510_dai);
 }
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 391ec2978aed..d004e5845298 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -1042,7 +1042,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8580 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8580);
 
-static int __devinit wm8580_modinit(void)
+static int __init wm8580_modinit(void)
 {
 	return snd_soc_register_dais(wm8580_dai, ARRAY_SIZE(wm8580_dai));
 }
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index d905e25b1a93..80b11983e137 100644
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -568,7 +568,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8728 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8728);
 
-static int __devinit wm8728_modinit(void)
+static int __init wm8728_modinit(void)
 {
 	return snd_soc_register_dai(&wm8728_dai);
 }
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 7b455a60d719..c444b9f2701e 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -793,7 +793,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8731 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8731);
 
-static int __devinit wm8731_modinit(void)
+static int __init wm8731_modinit(void)
 {
 	return snd_soc_register_dai(&wm8731_dai);
 }
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 84a6307de907..5997fa68e0d5 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -1085,7 +1085,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8750 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8750);
 
-static int __devinit wm8750_modinit(void)
+static int __init wm8750_modinit(void)
 {
 	return snd_soc_register_dai(&wm8750_dai);
 }
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 1caca30d0812..6c21b50c9375 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1874,7 +1874,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8753 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8753);
 
-static int __devinit wm8753_modinit(void)
+static int __init wm8753_modinit(void)
 {
 	return snd_soc_register_dais(wm8753_dai, ARRAY_SIZE(wm8753_dai));
 }
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 34e58af0c65a..ebf58fba1beb 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1473,7 +1473,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8900 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8900);
 
-static int __devinit wm8900_modinit(void)
+static int __init wm8900_modinit(void)
 {
 	return i2c_add_driver(&wm8900_i2c_driver);
 }
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 5d8fe7e1571e..0b5bea37e3dc 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1809,7 +1809,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8903 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8903);
 
-static int __devinit wm8903_modinit(void)
+static int __init wm8903_modinit(void)
 {
 	return snd_soc_register_dai(&wm8903_dai);
 }
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 2979fc4f44f1..88ead7f8dd98 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -935,7 +935,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8971 = {
 
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8971);
 
-static int __devinit wm8971_modinit(void)
+static int __init wm8971_modinit(void)
 {
 	return snd_soc_register_dai(&wm8971_dai);
 }
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 53e71aafe6c6..5b5afc144478 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1643,7 +1643,7 @@ struct snd_soc_codec_device soc_codec_dev_wm8990 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8990);
 
-static int __devinit wm8990_modinit(void)
+static int __init wm8990_modinit(void)
 {
 	return snd_soc_register_dai(&wm8990_dai);
 }
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index d89fc2f009ab..81ff5c37ab56 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -481,7 +481,7 @@ struct snd_soc_dai davinci_i2s_dai = {
 };
 EXPORT_SYMBOL_GPL(davinci_i2s_dai);
 
-static int __devinit davinci_i2s_init(void)
+static int __init davinci_i2s_init(void)
 {
 	return snd_soc_register_dai(&davinci_i2s_dai);
 }
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index f1b6e02d24ed..bc83e1cbd176 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -384,7 +384,7 @@ struct snd_soc_platform davinci_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(davinci_soc_platform);
 
-static int __devinit davinci_soc_platform_init(void)
+static int __init davinci_soc_platform_init(void)
 {
 	return snd_soc_register_platform(&davinci_soc_platform);
 }
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 646c807163ab..64993eda5679 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -853,7 +853,7 @@ int fsl_dma_configure(struct fsl_dma_info *dma_info)
 }
 EXPORT_SYMBOL_GPL(fsl_dma_configure);
 
-static int __devinit fsl_soc_platform_init(void)
+static int __init fsl_soc_platform_init(void)
 {
 	return snd_soc_register_platform(&fsl_soc_platform);
 }
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 41cab2034163..39cc57ce4bfd 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -499,7 +499,7 @@ struct snd_soc_dai omap_mcbsp_dai[] = {
 
 EXPORT_SYMBOL_GPL(omap_mcbsp_dai);
 
-static int __devinit omap_mcbsp_init(void)
+static int __init omap_mcbsp_init(void)
 {
 	return snd_soc_register_dais(omap_mcbsp_dai,
 				     ARRAY_SIZE(omap_mcbsp_dai));
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 9940de296316..ce580a97cbd5 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -354,7 +354,7 @@ struct snd_soc_platform omap_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(omap_soc_platform);
 
-static int __devinit omap_soc_platform_init(void)
+static int __init omap_soc_platform_init(void)
 {
 	return snd_soc_register_platform(&omap_soc_platform);
 }
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 3587f2fae5f1..73cb6b4c2f2d 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -913,7 +913,7 @@ struct snd_soc_dai pxa_ssp_dai[] = {
 };
 EXPORT_SYMBOL_GPL(pxa_ssp_dai);
 
-static int __devinit pxa_ssp_init(void)
+static int __init pxa_ssp_init(void)
 {
 	return snd_soc_register_dais(pxa_ssp_dai, ARRAY_SIZE(pxa_ssp_dai));
 }
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index f6249d5b492e..780db6757ad2 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -228,7 +228,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
 EXPORT_SYMBOL_GPL(pxa_ac97_dai);
 EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
-static int __devinit pxa_ac97_init(void)
+static int __init pxa_ac97_init(void)
 {
 	return snd_soc_register_dais(pxa_ac97_dai, ARRAY_SIZE(pxa_ac97_dai));
 }
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index 4fa1578f5d47..c670d08e7c9e 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -118,7 +118,7 @@ struct snd_soc_platform pxa2xx_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(pxa2xx_soc_platform);
 
-static int __devinit pxa2xx_soc_platform_init(void)
+static int __init pxa2xx_soc_platform_init(void)
 {
 	return snd_soc_register_platform(&pxa2xx_soc_platform);
 }
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c
index 2cf050791562..f3fc0aba0aaf 100644
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c
@@ -736,7 +736,7 @@ struct snd_soc_dai s3c2412_i2s_dai = {
 };
 EXPORT_SYMBOL_GPL(s3c2412_i2s_dai);
 
-static int __devinit s3c2412_i2s_init(void)
+static int __init s3c2412_i2s_init(void)
 {
 	return snd_soc_register_dai(&s3c2412_i2s_dai);
 }
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 7360c6d913bd..723779a3058d 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -396,7 +396,7 @@ struct snd_soc_dai s3c2443_ac97_dai[] = {
 EXPORT_SYMBOL_GPL(s3c2443_ac97_dai);
 EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
-static int __devinit s3c2443_ac97_init(void)
+static int __init s3c2443_ac97_init(void)
 {
 	return snd_soc_register_dai(&s3c2443_ac97_dai);
 }
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index 897b1ac92cef..6f4d439b57aa 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -482,7 +482,7 @@ struct snd_soc_dai s3c24xx_i2s_dai = {
 };
 EXPORT_SYMBOL_GPL(s3c24xx_i2s_dai);
 
-static int __devinit s3c24xx_i2s_init(void)
+static int __init s3c24xx_i2s_init(void)
 {
 	return snd_soc_register_dai(&s3c24xx_i2s_dai);
 }
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index ea5a9caec13e..7c64d31d067e 100644
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -465,7 +465,7 @@ struct snd_soc_platform s3c24xx_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(s3c24xx_soc_platform);
 
-static int __devinit s3c24xx_soc_platform_init(void)
+static int __init s3c24xx_soc_platform_init(void)
 {
 	return snd_soc_register_platform(&s3c24xx_soc_platform);
 }
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c
index 39ffca0933a2..0dad3a0bb920 100644
--- a/sound/soc/sh/dma-sh7760.c
+++ b/sound/soc/sh/dma-sh7760.c
@@ -348,7 +348,7 @@ struct snd_soc_platform sh7760_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(sh7760_soc_platform);
 
-static int __devinit sh7760_soc_platform_init(void)
+static int __init sh7760_soc_platform_init(void)
 {
 	return snd_soc_register_platform(&sh7760_soc_platform);
 }
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index 9169bad1acfb..eab31838badf 100644
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -314,7 +314,7 @@ struct snd_soc_dai sh4_hac_dai[] = {
 };
 EXPORT_SYMBOL_GPL(sh4_hac_dai);
 
-static int __devinit sh4_hac_init(void)
+static int __init sh4_hac_init(void)
 {
 	return snd_soc_register_dais(sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai));
 }
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index 9093588d4d07..d1e5390fddeb 100644
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -392,7 +392,7 @@ struct snd_soc_dai sh4_ssi_dai[] = {
 };
 EXPORT_SYMBOL_GPL(sh4_ssi_dai);
 
-static int __devinit sh4_ssi_init(void)
+static int __init sh4_ssi_init(void)
 {
 	return snd_soc_register_dais(sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai));
 }
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 76a89eb65baf..4d2db7cfaf4c 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2224,7 +2224,7 @@ void snd_soc_unregister_platform(struct snd_soc_platform *platform)
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_platform);
 
-static int __devinit snd_soc_init(void)
+static int __init snd_soc_init(void)
 {
 #ifdef CONFIG_DEBUG_FS
 	debugfs_root = debugfs_create_dir("asoc", NULL);
-- 
2.39.5