Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...

[sfrench/cifs-2.6.git] / arch / avr32 / mach-at32ap / clock.c

diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c
index 52c179bec0cc6c69d4430324a0a581f66e066a6d..fdf1caecb7b913617c28b022fede873d59450d52 100644 (file)
--- a/arch/avr32/mach-at32ap/clock.c
+++ b/arch/avr32/mach-at32ap/clock.c
@@ -242,7 +242,7 @@ dump_clock(struct clk *parent, struct clkinf *r)
                clk_get_rate(parent));
        if (parent->dev)
                seq_printf(r->s, ", for %s", dev_name(parent->dev));
                clk_get_rate(parent));
        if (parent->dev)
                seq_printf(r->s, ", for %s", dev_name(parent->dev));

-       seq_printf(r->s, "\n");
+       seq_putc(r->s, '\n');

 
        /* cost of this scan is small, but not linear... */
        r->nest = nest + NEST_DELTA;
 
        /* cost of this scan is small, but not linear... */
        r->nest = nest + NEST_DELTA;


@@ -261,23 +261,32 @@ static int clk_show(struct seq_file *s, void *unused)
        struct clk      *clk;
 
        /* show all the power manager registers */
        struct clk      *clk;
 
        /* show all the power manager registers */

-       seq_printf(s, "MCCTRL  = %8x\n", pm_readl(MCCTRL));
-       seq_printf(s, "CKSEL   = %8x\n", pm_readl(CKSEL));
-       seq_printf(s, "CPUMASK = %8x\n", pm_readl(CPU_MASK));
-       seq_printf(s, "HSBMASK = %8x\n", pm_readl(HSB_MASK));
-       seq_printf(s, "PBAMASK = %8x\n", pm_readl(PBA_MASK));
-       seq_printf(s, "PBBMASK = %8x\n", pm_readl(PBB_MASK));
-       seq_printf(s, "PLL0    = %8x\n", pm_readl(PLL0));
-       seq_printf(s, "PLL1    = %8x\n", pm_readl(PLL1));
-       seq_printf(s, "IMR     = %8x\n", pm_readl(IMR));
+       seq_printf(s,
+                  "MCCTRL  = %8x\n"
+                  "CKSEL   = %8x\n"
+                  "CPUMASK = %8x\n"
+                  "HSBMASK = %8x\n"
+                  "PBAMASK = %8x\n"
+                  "PBBMASK = %8x\n"
+                  "PLL0    = %8x\n"
+                  "PLL1    = %8x\n"
+                  "IMR     = %8x\n",
+                  pm_readl(MCCTRL),
+                  pm_readl(CKSEL),
+                  pm_readl(CPU_MASK),
+                  pm_readl(HSB_MASK),
+                  pm_readl(PBA_MASK),
+                  pm_readl(PBB_MASK),
+                  pm_readl(PLL0),
+                  pm_readl(PLL1),
+                  pm_readl(IMR));

        for (i = 0; i < 8; i++) {
                if (i == 5)
                        continue;
                seq_printf(s, "GCCTRL%d = %8x\n", i, pm_readl(GCCTRL(i)));
        }
 
        for (i = 0; i < 8; i++) {
                if (i == 5)
                        continue;
                seq_printf(s, "GCCTRL%d = %8x\n", i, pm_readl(GCCTRL(i)));
        }
 

-       seq_printf(s, "\n");
-
+       seq_putc(s, '\n');

        r.s = s;
        r.nest = 0;
        /* protected from changes on the list while dumping */
        r.s = s;
        r.nest = 0;
        /* protected from changes on the list while dumping */