Since driver load deferrals are expected and will already
have resulted in a kernel message, suppress an essentially
duplicate error message from the RPi audio board drivers.
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
16 files changed:
}
ret = snd_soc_register_card(&snd_adau1977_adc);
}
ret = snd_soc_register_card(&snd_adau1977_adc);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
return ret;
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
return ret;
}
ret = snd_soc_register_card(&snd_allo_piano_dac);
}
ret = snd_soc_register_card(&snd_allo_piano_dac);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
}
ret = snd_soc_register_card(&digidac1_soundcard);
}
ret = snd_soc_register_card(&digidac1_soundcard);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
}
ret = snd_soc_register_card(&snd_rpi_dionaudio_loco);
}
ret = snd_soc_register_card(&snd_rpi_dionaudio_loco);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
ret = snd_soc_register_card(&snd_rpi_hifiberry_amp);
ret = snd_soc_register_card(&snd_rpi_hifiberry_amp);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
}
ret = snd_soc_register_card(&snd_rpi_hifiberry_dac);
}
ret = snd_soc_register_card(&snd_rpi_hifiberry_dac);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
return ret;
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
return ret;
}
ret = snd_soc_register_card(&snd_rpi_hifiberry_dacplus);
}
ret = snd_soc_register_card(&snd_rpi_hifiberry_dacplus);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
}
ret = snd_soc_register_card(&snd_rpi_hifiberry_digi);
}
ret = snd_soc_register_card(&snd_rpi_hifiberry_digi);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
return ret;
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
return ret;
ret = snd_soc_register_card(&snd_rpi_iqaudio_dac);
if (ret) {
ret = snd_soc_register_card(&snd_rpi_iqaudio_dac);
if (ret) {
- dev_err(&pdev->dev,
- "snd_soc_register_card() failed: %d\n", ret);
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev,
+ "snd_soc_register_card() failed: %d\n", ret);
}
ret = snd_soc_register_card(card);
}
ret = snd_soc_register_card(card);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
}
ret = snd_soc_register_card(&snd_rpi_justboom_dac);
}
ret = snd_soc_register_card(&snd_rpi_justboom_dac);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
}
ret = snd_soc_register_card(&snd_rpi_justboom_digi);
}
ret = snd_soc_register_card(&snd_rpi_justboom_digi);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
ret = snd_soc_register_card(&pisnd_card);
if (ret < 0) {
ret = snd_soc_register_card(&pisnd_card);
if (ret < 0) {
- printe("snd_soc_register_card() failed: %d\n", ret);
+ if (ret != -EPROBE_DEFER)
+ printe("snd_soc_register_card() failed: %d\n", ret);
pisnd_uninit_gpio();
kobject_put(pisnd_kobj);
pisnd_spi_uninit();
pisnd_uninit_gpio();
kobject_put(pisnd_kobj);
pisnd_spi_uninit();
}
ret = snd_soc_register_card(&snd_rpi_raspidac3);
}
ret = snd_soc_register_card(&snd_rpi_raspidac3);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
}
ret = snd_soc_register_card(&snd_rpi_rpi_dac);
}
ret = snd_soc_register_card(&snd_rpi_rpi_dac);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
return ret;
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
return ret;
}
ret = snd_soc_register_card(&snd_rpi_proto);
}
ret = snd_soc_register_card(&snd_rpi_proto);
+ if (ret && ret != -EPROBE_DEFER)
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);
dev_err(&pdev->dev,
"snd_soc_register_card() failed: %d\n", ret);