Skip to content

Commit

Permalink
ASoC: omap: Remove needless prints from machine drivers
Browse files Browse the repository at this point in the history
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 <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Jarkko Nikula authored and Liam Girdwood committed Oct 10, 2010
1 parent ad5e465 commit ec588ae
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 24 deletions.
4 changes: 1 addition & 3 deletions sound/soc/omap/am3517evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,8 @@ static int __init am3517evm_soc_init(void)
{
int ret;

if (!machine_is_omap3517evm()) {
pr_err("Not OMAP3517 / AM3517 EVM!\n");
if (!machine_is_omap3517evm())
return -ENODEV;
}
pr_info("OMAP3517 / AM3517 EVM SoC init\n");

am3517evm_snd_device = platform_device_alloc("soc-audio", -1);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/omap/igep0020.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ static int __init igep2_soc_init(void)
{
int ret;

if (!machine_is_igep0020()) {
pr_debug("Not IGEP v2!\n");
if (!machine_is_igep0020())
return -ENODEV;
}
printk(KERN_INFO "IGEP v2 SoC init\n");

igep2_snd_device = platform_device_alloc("soc-audio", -1);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/omap/omap2evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,8 @@ static int __init omap2evm_soc_init(void)
{
int ret;

if (!machine_is_omap2evm()) {
pr_debug("Not omap2evm!\n");
if (!machine_is_omap2evm())
return -ENODEV;
}
printk(KERN_INFO "omap2evm SoC init\n");

omap2evm_snd_device = platform_device_alloc("soc-audio", -1);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/omap/omap3beagle.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,8 @@ static int __init omap3beagle_soc_init(void)
{
int ret;

if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) {
pr_debug("Not OMAP3 Beagle or Devkit8000!\n");
if (!(machine_is_omap3_beagle() || machine_is_devkit8000()))
return -ENODEV;
}
pr_info("OMAP3 Beagle/Devkit8000 SoC init\n");

omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/omap/omap3evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@ static int __init omap3evm_soc_init(void)
{
int ret;

if (!machine_is_omap3evm()) {
pr_err("Not OMAP3 EVM!\n");
if (!machine_is_omap3evm())
return -ENODEV;
}
pr_info("OMAP3 EVM SoC init\n");

omap3evm_snd_device = platform_device_alloc("soc-audio", -1);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/omap/sdp3430.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,8 @@ static int __init sdp3430_soc_init(void)
int ret;
u8 pin_mux;

if (!machine_is_omap_3430sdp()) {
pr_debug("Not SDP3430!\n");
if (!machine_is_omap_3430sdp())
return -ENODEV;
}
printk(KERN_INFO "SDP3430 SoC init\n");

sdp3430_snd_device = platform_device_alloc("soc-audio", -1);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/omap/sdp4430.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,8 @@ static int __init sdp4430_soc_init(void)
{
int ret;

if (!machine_is_omap_4430sdp()) {
pr_debug("Not SDP4430!\n");
if (!machine_is_omap_4430sdp())
return -ENODEV;
}
printk(KERN_INFO "SDP4430 SoC init\n");

sdp4430_snd_device = platform_device_alloc("soc-audio", -1);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/omap/zoom2.c
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,8 @@ static int __init zoom2_soc_init(void)
{
int ret;

if (!machine_is_omap_zoom2()) {
pr_debug("Not Zoom2!\n");
if (!machine_is_omap_zoom2())
return -ENODEV;
}
printk(KERN_INFO "Zoom2 SoC init\n");

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

0 comments on commit ec588ae

Please sign in to comment.