aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/omap/am3517evm.c4
-rw-r--r--sound/soc/omap/igep0020.c4
-rw-r--r--sound/soc/omap/omap2evm.c4
-rw-r--r--sound/soc/omap/omap3beagle.c4
-rw-r--r--sound/soc/omap/omap3evm.c4
-rw-r--r--sound/soc/omap/sdp3430.c4
-rw-r--r--sound/soc/omap/sdp4430.c4
-rw-r--r--sound/soc/omap/zoom2.c4
8 files changed, 8 insertions, 24 deletions
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index 68bd902ccd4e..979dd508305f 100644
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -157,10 +157,8 @@ static int __init am3517evm_soc_init(void)
157{ 157{
158 int ret; 158 int ret;
159 159
160 if (!machine_is_omap3517evm()) { 160 if (!machine_is_omap3517evm())
161 pr_err("Not OMAP3517 / AM3517 EVM!\n");
162 return -ENODEV; 161 return -ENODEV;
163 }
164 pr_info("OMAP3517 / AM3517 EVM SoC init\n"); 162 pr_info("OMAP3517 / AM3517 EVM SoC init\n");
165 163
166 am3517evm_snd_device = platform_device_alloc("soc-audio", -1); 164 am3517evm_snd_device = platform_device_alloc("soc-audio", -1);
diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c
index d296cfcc672e..fd3a40f309c8 100644
--- a/sound/soc/omap/igep0020.c
+++ b/sound/soc/omap/igep0020.c
@@ -101,10 +101,8 @@ static int __init igep2_soc_init(void)
101{ 101{
102 int ret; 102 int ret;
103 103
104 if (!machine_is_igep0020()) { 104 if (!machine_is_igep0020())
105 pr_debug("Not IGEP v2!\n");
106 return -ENODEV; 105 return -ENODEV;
107 }
108 printk(KERN_INFO "IGEP v2 SoC init\n"); 106 printk(KERN_INFO "IGEP v2 SoC init\n");
109 107
110 igep2_snd_device = platform_device_alloc("soc-audio", -1); 108 igep2_snd_device = platform_device_alloc("soc-audio", -1);
diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c
index 38cd1894623e..cf3fc8a675b5 100644
--- a/sound/soc/omap/omap2evm.c
+++ b/sound/soc/omap/omap2evm.c
@@ -103,10 +103,8 @@ static int __init omap2evm_soc_init(void)
103{ 103{
104 int ret; 104 int ret;
105 105
106 if (!machine_is_omap2evm()) { 106 if (!machine_is_omap2evm())
107 pr_debug("Not omap2evm!\n");
108 return -ENODEV; 107 return -ENODEV;
109 }
110 printk(KERN_INFO "omap2evm SoC init\n"); 108 printk(KERN_INFO "omap2evm SoC init\n");
111 109
112 omap2evm_snd_device = platform_device_alloc("soc-audio", -1); 110 omap2evm_snd_device = platform_device_alloc("soc-audio", -1);
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
index 7c11e1afe9e6..e56832b0c444 100644
--- a/sound/soc/omap/omap3beagle.c
+++ b/sound/soc/omap/omap3beagle.c
@@ -112,10 +112,8 @@ static int __init omap3beagle_soc_init(void)
112{ 112{
113 int ret; 113 int ret;
114 114
115 if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) { 115 if (!(machine_is_omap3_beagle() || machine_is_devkit8000()))
116 pr_debug("Not OMAP3 Beagle or Devkit8000!\n");
117 return -ENODEV; 116 return -ENODEV;
118 }
119 pr_info("OMAP3 Beagle/Devkit8000 SoC init\n"); 117 pr_info("OMAP3 Beagle/Devkit8000 SoC init\n");
120 118
121 omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); 119 omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c
index 1ac5babef00d..810f1e36da21 100644
--- a/sound/soc/omap/omap3evm.c
+++ b/sound/soc/omap/omap3evm.c
@@ -99,10 +99,8 @@ static int __init omap3evm_soc_init(void)
99{ 99{
100 int ret; 100 int ret;
101 101
102 if (!machine_is_omap3evm()) { 102 if (!machine_is_omap3evm())
103 pr_err("Not OMAP3 EVM!\n");
104 return -ENODEV; 103 return -ENODEV;
105 }
106 pr_info("OMAP3 EVM SoC init\n"); 104 pr_info("OMAP3 EVM SoC init\n");
107 105
108 omap3evm_snd_device = platform_device_alloc("soc-audio", -1); 106 omap3evm_snd_device = platform_device_alloc("soc-audio", -1);
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index 76ce77b91844..07fbcf7d2411 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -296,10 +296,8 @@ static int __init sdp3430_soc_init(void)
296 int ret; 296 int ret;
297 u8 pin_mux; 297 u8 pin_mux;
298 298
299 if (!machine_is_omap_3430sdp()) { 299 if (!machine_is_omap_3430sdp())
300 pr_debug("Not SDP3430!\n");
301 return -ENODEV; 300 return -ENODEV;
302 }
303 printk(KERN_INFO "SDP3430 SoC init\n"); 301 printk(KERN_INFO "SDP3430 SoC init\n");
304 302
305 sdp3430_snd_device = platform_device_alloc("soc-audio", -1); 303 sdp3430_snd_device = platform_device_alloc("soc-audio", -1);
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index 62f6a622d791..4b4463db6ba0 100644
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -186,10 +186,8 @@ static int __init sdp4430_soc_init(void)
186{ 186{
187 int ret; 187 int ret;
188 188
189 if (!machine_is_omap_4430sdp()) { 189 if (!machine_is_omap_4430sdp())
190 pr_debug("Not SDP4430!\n");
191 return -ENODEV; 190 return -ENODEV;
192 }
193 printk(KERN_INFO "SDP4430 SoC init\n"); 191 printk(KERN_INFO "SDP4430 SoC init\n");
194 192
195 sdp4430_snd_device = platform_device_alloc("soc-audio", -1); 193 sdp4430_snd_device = platform_device_alloc("soc-audio", -1);
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 338dc9552bd6..718031eeac34 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -245,10 +245,8 @@ static int __init zoom2_soc_init(void)
245{ 245{
246 int ret; 246 int ret;
247 247
248 if (!machine_is_omap_zoom2()) { 248 if (!machine_is_omap_zoom2())
249 pr_debug("Not Zoom2!\n");
250 return -ENODEV; 249 return -ENODEV;
251 }
252 printk(KERN_INFO "Zoom2 SoC init\n"); 250 printk(KERN_INFO "Zoom2 SoC init\n");
253 251
254 zoom2_snd_device = platform_device_alloc("soc-audio", -1); 252 zoom2_snd_device = platform_device_alloc("soc-audio", -1);