Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux-2.6-block.git] / arch / arm / mach-davinci / board-dm355-evm.c

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index c71dd9982f03a1eadf5e4b75b2d8a284f343bda8..1844076f64030c94ecd13f31b7c6ff85bd9deae1 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -384,9 +384,7 @@ static __init void dm355_evm_init(void)
        dm355evm_dm9000_rsrc[2].start = gpio_to_irq(1);
 
        aemif = clk_get(&dm355evm_dm9000.dev, "aemif");
-       if (IS_ERR(aemif))
-               WARN("%s: unable to get AEMIF clock\n", __func__);
-       else
+       if (!WARN(IS_ERR(aemif), "unable to get AEMIF clock\n"))
                clk_prepare_enable(aemif);
 
        platform_add_devices(davinci_evm_devices,