[POWERPC] celleb: Coding style cleanup

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/celleb/beat.c
index 93ebb7d85120fe7172f83c67e717410b61f92fdd..b64b171f245b513e57ca5d7174c05384aecccf30 100644 (file)
--- a/arch/powerpc/platforms/celleb/beat.c
+++ b/arch/powerpc/platforms/celleb/beat.c
@@ -48,6 +48,7 @@ void beat_power_off(void)
 }
 
 u64 beat_halt_code = 0x1000000000000000UL;
+EXPORT_SYMBOL(beat_halt_code);
 
 void beat_halt(void)
 {
@@ -94,9 +95,8 @@ ssize_t beat_nvram_read(char *buf, size_t count, loff_t *index)
                len = count;
                if (len > BEAT_NVRW_CNT)
                        len = BEAT_NVRW_CNT;
-               if (beat_eeprom_read(i, len, p)) {
+               if (beat_eeprom_read(i, len, p))
                        return -EIO;
-               }
 
                p += len;
                i += len;
@@ -121,9 +121,8 @@ ssize_t beat_nvram_write(char *buf, size_t count, loff_t *index)
                len = count;
                if (len > BEAT_NVRW_CNT)
                        len = BEAT_NVRW_CNT;
-               if (beat_eeprom_write(i, len, p)) {
+               if (beat_eeprom_write(i, len, p))
                        return -EIO;
-               }
 
                p += len;
                i += len;
@@ -149,13 +148,14 @@ int64_t beat_get_term_char(u64 vterm, u64 *len, u64 *t1, u64 *t2)
        u64 db[2];
        s64 ret;
 
-       ret = beat_get_characters_from_console(vterm, len, (u8*)db);
+       ret = beat_get_characters_from_console(vterm, len, (u8 *)db);
        if (ret == 0) {
                *t1 = db[0];
                *t2 = db[1];
        }
        return ret;
 }
+EXPORT_SYMBOL(beat_get_term_char);
 
 int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
 {
@@ -163,8 +163,9 @@ int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
 
        db[0] = t1;
        db[1] = t2;
-       return beat_put_characters_to_console(vterm, len, (u8*)db);
+       return beat_put_characters_to_console(vterm, len, (u8 *)db);
 }
+EXPORT_SYMBOL(beat_put_term_char);
 
 void beat_power_save(void)
 {
@@ -261,7 +262,3 @@ static int __init beat_event_init(void)
 }
 
 device_initcall(beat_event_init);
-
-EXPORT_SYMBOL(beat_get_term_char);
-EXPORT_SYMBOL(beat_put_term_char);
-EXPORT_SYMBOL(beat_halt_code);

diff --git a/arch/powerpc/platforms/celleb/beat.h b/arch/powerpc/platforms/celleb/beat.h
index ac82ac35b9918a98bff6ec5d4fcc8918e5796689..32c8efcedc8091ed673592456a2249d73dbd3c83 100644 (file)
--- a/arch/powerpc/platforms/celleb/beat.h
+++ b/arch/powerpc/platforms/celleb/beat.h
@@ -21,8 +21,8 @@
 #ifndef _CELLEB_BEAT_H
 #define _CELLEB_BEAT_H
 
-int64_t beat_get_term_char(uint64_t,uint64_t*,uint64_t*,uint64_t*);
-int64_t beat_put_term_char(uint64_t,uint64_t,uint64_t,uint64_t);
+int64_t beat_get_term_char(uint64_t, uint64_t *, uint64_t *, uint64_t *);
+int64_t beat_put_term_char(uint64_t, uint64_t, uint64_t, uint64_t);
 int64_t beat_repository_encode(int, const char *, uint64_t[4]);
 void beat_restart(char *);
 void beat_power_off(void);

diff --git a/arch/powerpc/platforms/celleb/beat_wrapper.h b/arch/powerpc/platforms/celleb/beat_wrapper.h
index cbc1487df7def6cbb44d62d29462757eae35163f..b47dfda48d0672442b212d41dd93cbaa0833e437 100644 (file)
--- a/arch/powerpc/platforms/celleb/beat_wrapper.h
+++ b/arch/powerpc/platforms/celleb/beat_wrapper.h
@@ -197,7 +197,8 @@ static inline s64 beat_put_characters_to_console(u64 termno, u64 len,
        u64 b[2];
 
        memcpy(b, buffer, len);
-       return beat_hcall_norets(HV_put_characters_to_console, termno, len,                                      b[0], b[1]);
+       return beat_hcall_norets(HV_put_characters_to_console, termno, len,
+               b[0], b[1]);
 }
 
 static inline s64 beat_get_spe_privileged_state_1_registers(

diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/celleb/htab.c
index fbf27c74ebda04c3b0cfecd8bebfd322836699ce..81467ff055c8313152862f02eb8d828d3f349951 100644 (file)
--- a/arch/powerpc/platforms/celleb/htab.c
+++ b/arch/powerpc/platforms/celleb/htab.c
@@ -35,9 +35,9 @@
 #include "beat_wrapper.h"
 
 #ifdef DEBUG_LOW
-#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)
+#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0)
 #else
-#define DBG_LOW(fmt...) do { } while(0)
+#define DBG_LOW(fmt...) do { } while (0)
 #endif
 
 static DEFINE_SPINLOCK(beat_htab_lock);
@@ -116,7 +116,8 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
                hpte_r &= ~_PAGE_COHERENT;
 
        spin_lock(&beat_htab_lock);
-       if ((lpar_rc = beat_read_mask(hpte_group)) == 0) {
+       lpar_rc = beat_read_mask(hpte_group);
+       if (lpar_rc == 0) {
                if (!(vflags & HPTE_V_BOLTED))
                        DBG_LOW(" full\n");
                spin_unlock(&beat_htab_lock);

diff --git a/arch/powerpc/platforms/celleb/interrupt.c b/arch/powerpc/platforms/celleb/interrupt.c
index c7c68ca70c82a321b3eaba1175ab0cb22a12eb8d..69562a867876ebd54dbdd7e3f4ac85f2b34fd377 100644 (file)
--- a/arch/powerpc/platforms/celleb/interrupt.c
+++ b/arch/powerpc/platforms/celleb/interrupt.c
@@ -34,7 +34,7 @@ static DEFINE_SPINLOCK(beatic_irq_mask_lock);
 static uint64_t        beatic_irq_mask_enable[(MAX_IRQS+255)/64];
 static uint64_t        beatic_irq_mask_ack[(MAX_IRQS+255)/64];
 
-static struct irq_host *beatic_host = NULL;
+static struct irq_host *beatic_host;
 
 /*
  * In this implementation, "virq" == "IRQ plug number",
@@ -49,13 +49,13 @@ static inline void beatic_update_irq_mask(unsigned int irq_plug)
 
        off = (irq_plug / 256) * 4;
        masks[0] = beatic_irq_mask_enable[off + 0]
-                  & beatic_irq_mask_ack[off + 0];
+               & beatic_irq_mask_ack[off + 0];
        masks[1] = beatic_irq_mask_enable[off + 1]
-                  & beatic_irq_mask_ack[off + 1];
+               & beatic_irq_mask_ack[off + 1];
        masks[2] = beatic_irq_mask_enable[off + 2]
-                  & beatic_irq_mask_ack[off + 2];
+               & beatic_irq_mask_ack[off + 2];
        masks[3] = beatic_irq_mask_enable[off + 3]
-                  & beatic_irq_mask_ack[off + 3];
+               & beatic_irq_mask_ack[off + 3];
        if (beat_set_interrupt_mask(irq_plug&~255UL,
                masks[0], masks[1], masks[2], masks[3]) != 0)
                panic("Failed to set mask IRQ!");
@@ -96,7 +96,8 @@ static void beatic_end_irq(unsigned int irq_plug)
        s64 err;
        unsigned long flags;
 
-       if ((err = beat_downcount_of_interrupt(irq_plug)) != 0) {
+       err = beat_downcount_of_interrupt(irq_plug);
+       if (err != 0) {
                if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
                        panic("Failed to downcount IRQ! Error = %16lx", err);
 
@@ -138,7 +139,8 @@ static int beatic_pic_host_map(struct irq_host *h, unsigned int virq,
        struct irq_desc *desc = get_irq_desc(virq);
        int64_t err;
 
-       if ((err = beat_construct_and_connect_irq_plug(virq, hw)) < 0)
+       err = beat_construct_and_connect_irq_plug(virq, hw);
+       if (err < 0)
                return -EIO;
 
        desc->status |= IRQ_LEVEL;
@@ -202,22 +204,22 @@ static inline unsigned int beatic_get_irq_plug(void)
                beat_detect_pending_interrupts(i, pending);
                __asm__ ("cntlzd %0,%1":"=r"(ub):
                        "r"(pending[0] & beatic_irq_mask_enable[i/64+0]
-                                      & beatic_irq_mask_ack[i/64+0]));
+                                      & beatic_irq_mask_ack[i/64+0]));
                if (ub != 64)
                        return i + ub + 0;
                __asm__ ("cntlzd %0,%1":"=r"(ub):
                        "r"(pending[1] & beatic_irq_mask_enable[i/64+1]
-                                      & beatic_irq_mask_ack[i/64+1]));
+                                      & beatic_irq_mask_ack[i/64+1]));
                if (ub != 64)
                        return i + ub + 64;
                __asm__ ("cntlzd %0,%1":"=r"(ub):
                        "r"(pending[2] & beatic_irq_mask_enable[i/64+2]
-                                      & beatic_irq_mask_ack[i/64+2]));
+                                      & beatic_irq_mask_ack[i/64+2]));
                if (ub != 64)
                        return i + ub + 128;
                __asm__ ("cntlzd %0,%1":"=r"(ub):
                        "r"(pending[3] & beatic_irq_mask_enable[i/64+3]
-                                      & beatic_irq_mask_ack[i/64+3]));
+                                      & beatic_irq_mask_ack[i/64+3]));
                if (ub != 64)
                        return i + ub + 192;
        }
@@ -250,7 +252,7 @@ void __init beatic_init_IRQ(void)
 
        /* Allocate an irq host */
        beatic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
-                                        &beatic_pic_host_ops,
+                                    &beatic_pic_host_ops,
                                         0);
        BUG_ON(beatic_host == NULL);
        irq_set_default_host(beatic_host);

diff --git a/arch/powerpc/platforms/celleb/scc_epci.c b/arch/powerpc/platforms/celleb/scc_epci.c
index a3c7cfbcb323049da70590529d8e20dea251fda5..a999b393f6f6e81a0f2e72a2e52cbad49aa7d4bb 100644 (file)
--- a/arch/powerpc/platforms/celleb/scc_epci.c
+++ b/arch/powerpc/platforms/celleb/scc_epci.c
@@ -161,9 +161,9 @@ static PCI_IO_ADDR celleb_epci_make_config_addr(
        if (bus != hose->bus)
                addr = celleb_epci_get_epci_cfg(hose) +
                       (((bus->number & 0xff) << 16)
-                       | ((devfn & 0xff) << 8)
-                       | (where & 0xff)
-                       | 0x01000000);
+                       | ((devfn & 0xff) << 8)
+                       | (where & 0xff)
+                       | 0x01000000);
        else
                addr = celleb_epci_get_epci_cfg(hose) +
                       (((devfn & 0xff) << 8) | (where & 0xff));
@@ -174,7 +174,7 @@ static PCI_IO_ADDR celleb_epci_make_config_addr(
 }
 
 static int celleb_epci_read_config(struct pci_bus *bus,
-                       unsigned int devfn, int where, int size, u32 * val)
+                       unsigned int devfn, int where, int size, u32 *val)
 {
        PCI_IO_ADDR epci_base;
        PCI_IO_ADDR addr;

diff --git a/arch/powerpc/platforms/celleb/scc_sio.c b/arch/powerpc/platforms/celleb/scc_sio.c
index 610008211ca1018e8ad882fd9b3abd85a30c1233..3a16c5b3c46449fed01aa4db4678b25d902a7540 100644 (file)
--- a/arch/powerpc/platforms/celleb/scc_sio.c
+++ b/arch/powerpc/platforms/celleb/scc_sio.c
@@ -28,7 +28,7 @@
 
 /* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
     mmio=0xfff000-0x1000,0xff2000-0x1000 */
-static int txx9_serial_bitmap __initdata = 0;
+static int txx9_serial_bitmap __initdata;
 
 static struct {
        uint32_t offset;
@@ -84,7 +84,7 @@ static int __init txx9_serial_config(char *ptr)
        int     i;
 
        for (;;) {
-               switch(get_option(&ptr, &i)) {
+               switch (get_option(&ptr, &i)) {
                default:
                        return 0;
                case 2:

diff --git a/arch/powerpc/platforms/celleb/spu_priv1.c b/arch/powerpc/platforms/celleb/spu_priv1.c
index 2bf6700f747a006f63f53e52f4fe3f37f1df7207..bcc17f7fe8adfaba96ba7763ae675af31fb27c15 100644 (file)
--- a/arch/powerpc/platforms/celleb/spu_priv1.c
+++ b/arch/powerpc/platforms/celleb/spu_priv1.c
@@ -183,8 +183,7 @@ static u64 resource_allocation_enable_get(struct spu *spu)
        return enable;
 }
 
-const struct spu_priv1_ops spu_priv1_beat_ops =
-{
+const struct spu_priv1_ops spu_priv1_beat_ops = {
        .int_mask_and = int_mask_and,
        .int_mask_or = int_mask_or,
        .int_mask_set = int_mask_set,

diff --git a/arch/powerpc/platforms/celleb/udbg_beat.c b/arch/powerpc/platforms/celleb/udbg_beat.c
index d888c4674c62d7c495933632dbbae5cf9ddd33d4..6b418f6b61750ec6f94e8f4fc89606696f6ab1f9 100644 (file)
--- a/arch/powerpc/platforms/celleb/udbg_beat.c
+++ b/arch/powerpc/platforms/celleb/udbg_beat.c
@@ -54,7 +54,8 @@ static int udbg_getc_poll_beat(void)
        if (inbuflen == 0) {
                /* get some more chars. */
                inbuflen = 0;
-               rc = beat_get_term_char(celleb_vtermno, &inbuflen, inbuf+0, inbuf+1);
+               rc = beat_get_term_char(celleb_vtermno, &inbuflen,
+                                       inbuf+0, inbuf+1);
                if (rc != 0)
                        inbuflen = 0;   /* otherwise inbuflen is garbage */
        }
@@ -78,7 +79,7 @@ static int udbg_getc_beat(void)
                if (ch == -1) {
                        /* This shouldn't be needed...but... */
                        volatile unsigned long delay;
-                       for (delay=0; delay < 2000000; delay++)
+                       for (delay = 0; delay < 2000000; delay++)
                                ;
                } else {
                        return ch;