Skip to content

Commit ec588ae

Browse files
Jarkko NikulaLiam Girdwood
authored andcommitted
ASoC: omap: Remove needless prints from machine drivers
It is currently completely normal to execute these machine drivers code on different boards if the kernel includes support for multiple boards so no error message should be printed if the machine_is_xxx does not match with the machine driver. Therefore remove these pr_err and pr_debug prints in those cases. Signed-off-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
1 parent ad5e465 commit ec588ae

File tree

8 files changed

+8
-24
lines changed

8 files changed

+8
-24
lines changed

sound/soc/omap/am3517evm.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,8 @@ static int __init am3517evm_soc_init(void)
157157
{
158158
int ret;
159159

160-
if (!machine_is_omap3517evm()) {
161-
pr_err("Not OMAP3517 / AM3517 EVM!\n");
160+
if (!machine_is_omap3517evm())
162161
return -ENODEV;
163-
}
164162
pr_info("OMAP3517 / AM3517 EVM SoC init\n");
165163

166164
am3517evm_snd_device = platform_device_alloc("soc-audio", -1);

sound/soc/omap/igep0020.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,8 @@ static int __init igep2_soc_init(void)
101101
{
102102
int ret;
103103

104-
if (!machine_is_igep0020()) {
105-
pr_debug("Not IGEP v2!\n");
104+
if (!machine_is_igep0020())
106105
return -ENODEV;
107-
}
108106
printk(KERN_INFO "IGEP v2 SoC init\n");
109107

110108
igep2_snd_device = platform_device_alloc("soc-audio", -1);

sound/soc/omap/omap2evm.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,8 @@ static int __init omap2evm_soc_init(void)
103103
{
104104
int ret;
105105

106-
if (!machine_is_omap2evm()) {
107-
pr_debug("Not omap2evm!\n");
106+
if (!machine_is_omap2evm())
108107
return -ENODEV;
109-
}
110108
printk(KERN_INFO "omap2evm SoC init\n");
111109

112110
omap2evm_snd_device = platform_device_alloc("soc-audio", -1);

sound/soc/omap/omap3beagle.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,8 @@ static int __init omap3beagle_soc_init(void)
112112
{
113113
int ret;
114114

115-
if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) {
116-
pr_debug("Not OMAP3 Beagle or Devkit8000!\n");
115+
if (!(machine_is_omap3_beagle() || machine_is_devkit8000()))
117116
return -ENODEV;
118-
}
119117
pr_info("OMAP3 Beagle/Devkit8000 SoC init\n");
120118

121119
omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);

sound/soc/omap/omap3evm.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@ static int __init omap3evm_soc_init(void)
9999
{
100100
int ret;
101101

102-
if (!machine_is_omap3evm()) {
103-
pr_err("Not OMAP3 EVM!\n");
102+
if (!machine_is_omap3evm())
104103
return -ENODEV;
105-
}
106104
pr_info("OMAP3 EVM SoC init\n");
107105

108106
omap3evm_snd_device = platform_device_alloc("soc-audio", -1);

sound/soc/omap/sdp3430.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,8 @@ static int __init sdp3430_soc_init(void)
296296
int ret;
297297
u8 pin_mux;
298298

299-
if (!machine_is_omap_3430sdp()) {
300-
pr_debug("Not SDP3430!\n");
299+
if (!machine_is_omap_3430sdp())
301300
return -ENODEV;
302-
}
303301
printk(KERN_INFO "SDP3430 SoC init\n");
304302

305303
sdp3430_snd_device = platform_device_alloc("soc-audio", -1);

sound/soc/omap/sdp4430.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,8 @@ static int __init sdp4430_soc_init(void)
186186
{
187187
int ret;
188188

189-
if (!machine_is_omap_4430sdp()) {
190-
pr_debug("Not SDP4430!\n");
189+
if (!machine_is_omap_4430sdp())
191190
return -ENODEV;
192-
}
193191
printk(KERN_INFO "SDP4430 SoC init\n");
194192

195193
sdp4430_snd_device = platform_device_alloc("soc-audio", -1);

sound/soc/omap/zoom2.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,8 @@ static int __init zoom2_soc_init(void)
245245
{
246246
int ret;
247247

248-
if (!machine_is_omap_zoom2()) {
249-
pr_debug("Not Zoom2!\n");
248+
if (!machine_is_omap_zoom2())
250249
return -ENODEV;
251-
}
252250
printk(KERN_INFO "Zoom2 SoC init\n");
253251

254252
zoom2_snd_device = platform_device_alloc("soc-audio", -1);

0 commit comments

Comments
 (0)