Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non...

[~andy/linux] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index b82538d0d46fc22da941397a6b37ef75f91e2d7b..daa0ff65f59941e24eadc5908e543a79f8d97f55 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -393,10 +393,8 @@ static void __init omap_init_dmic(void)
        struct platform_device *pdev;
 
        oh = omap_hwmod_lookup("dmic");
-       if (!oh) {
-               pr_err("Could not look up dmic hw_mod\n");
+       if (!oh)
                return;
-       }
 
        pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0);
        WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n");
@@ -419,10 +417,8 @@ static void __init omap_init_hdmi_audio(void)
        struct platform_device *pdev;
 
        oh = omap_hwmod_lookup("dss_hdmi");
-       if (!oh) {
-               printk(KERN_ERR "Could not look up dss_hdmi hw_mod\n");
+       if (!oh)
                return;
-       }
 
        pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0);
        WARN(IS_ERR(pdev),