drm/i915: Always recompute watermarks when distrust_bios_wm is set, v2.

[karo-tx-linux.git] / drivers / clk / clk-nomadik.c

diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c
index 71677eb125656420482f9b6405fa3765d0c5bb80..13ad6d1e509082f12b0466acb127c3cffc858cba 100644 (file)
--- a/drivers/clk/clk-nomadik.c
+++ b/drivers/clk/clk-nomadik.c
@@ -267,10 +267,8 @@ pll_clk_register(struct device *dev, const char *name,
        }
 
        pll = kzalloc(sizeof(*pll), GFP_KERNEL);
-       if (!pll) {
-               pr_err("%s: could not allocate PLL clk\n", __func__);
+       if (!pll)
                return ERR_PTR(-ENOMEM);
-       }
 
        init.name = name;
        init.ops = &pll_clk_ops;
@@ -356,11 +354,9 @@ src_clk_register(struct device *dev, const char *name,
        struct clk_init_data init;
 
        sclk = kzalloc(sizeof(*sclk), GFP_KERNEL);
-       if (!sclk) {
-               pr_err("could not allocate SRC clock %s\n",
-                       name);
+       if (!sclk)
                return ERR_PTR(-ENOMEM);
-       }
+
        init.name = name;
        init.ops = &src_clk_ops;
        /* Do not force-disable the static SDRAM controller */
@@ -467,7 +463,7 @@ static int nomadik_src_clk_show(struct seq_file *s, void *what)
        u32 src_pckensr0 = readl(src_base + SRC_PCKENSR0);
        u32 src_pckensr1 = readl(src_base + SRC_PCKENSR1);
 
-       seq_printf(s, "Clock:      Boot:   Now:    Request: ASKED:\n");
+       seq_puts(s, "Clock:      Boot:   Now:    Request: ASKED:\n");
        for (i = 0; i < ARRAY_SIZE(src_clk_names); i++) {
                u32 pcksrb = (i < 0x20) ? src_pcksr0_boot : src_pcksr1_boot;
                u32 pcksr = (i < 0x20) ? src_pcksr0 : src_pcksr1;