arm: powerpc: Tidy up code style for interrupt functions

Remove the unwanted space before the bracket.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c
index fc3658951ca284fc869296f6912fc95221adeb3c..674ad0715b51159fe2cc3df684f36c49d65898ec 100644 (file)
--- a/arch/arm/cpu/arm11/cpu.c
+++ b/arch/arm/cpu/arm11/cpu.c
@@ -30,7 +30,7 @@ int cleanup_before_linux (void)
         * we turn off caches etc ...
         */
 
-       disable_interrupts ();
+       disable_interrupts();
 
        /* turn off I/D-cache */
        icache_disable();

diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c
index 980a734d1b351431f64b3c2df800a76609b2769c..4874b620e6b2accc63b9e0c0a2ffd79ab881e2e1 100644 (file)
--- a/arch/arm/cpu/arm920t/cpu.c
+++ b/arch/arm/cpu/arm920t/cpu.c
@@ -28,7 +28,7 @@ int cleanup_before_linux (void)
         * we turn off caches etc ...
         */
 
-       disable_interrupts ();
+       disable_interrupts();
 
        /* turn off I/D-cache */
        icache_disable();

diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c
index 2ae46f0357e9526fa34c5b8d2a6533d3b54bd553..ffa2a2302a81f0e8ae5b09ad62140cf69c6d0adb 100644 (file)
--- a/arch/arm/cpu/arm926ejs/cpu.c
+++ b/arch/arm/cpu/arm926ejs/cpu.c
@@ -28,7 +28,7 @@ int cleanup_before_linux (void)
         * we turn off caches etc ...
         */
 
-       disable_interrupts ();
+       disable_interrupts();
 
 
        /* turn off I/D-cache */

diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
index 434fed58bfe577e7a42e735a33b817a40e02b310..8523a9759e73aca56fc0274ff87680f0113f9875 100644 (file)
--- a/arch/arm/cpu/arm946es/cpu.c
+++ b/arch/arm/cpu/arm946es/cpu.c
@@ -29,7 +29,7 @@ int cleanup_before_linux (void)
         * we turn off caches etc ...
         */
 
-       disable_interrupts ();
+       disable_interrupts();
 
        /* ARM926E-S needs the protection unit enabled for the icache to have
         * been enabled  - left for possible later use

diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c
index 6a849ffeafa640d37904b60f084d47113c147bcf..17c01dd81fd97cc76e39ba1a484b64a1ba2ac1c6 100644 (file)
--- a/arch/arm/cpu/sa1100/cpu.c
+++ b/arch/arm/cpu/sa1100/cpu.c
@@ -30,7 +30,7 @@ int cleanup_before_linux (void)
         * just disable everything that can disturb booting linux
         */
 
-       disable_interrupts ();
+       disable_interrupts();
 
        /* turn off I-cache */
        icache_disable();

diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index ee775ce5d2641b4bc7c77f117ba413c4e7257a87..e78ca56d2530543873fd636e4a5f55b0df2502be 100644 (file)
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -25,7 +25,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int interrupt_init (void)
+int interrupt_init(void)
 {
        /*
         * setup up stacks if necessary
@@ -35,11 +35,11 @@ int interrupt_init (void)
        return 0;
 }
 
-void enable_interrupts (void)
+void enable_interrupts(void)
 {
        return;
 }
-int disable_interrupts (void)
+int disable_interrupts(void)
 {
        return 0;
 }

diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c
index 2d1c6136a11510c4da2cf8eb4e6c63dea170e9eb..85ae3b4ee070334c3094114af3866a21e3cc63b3 100644 (file)
--- a/arch/m68k/lib/interrupts.c
+++ b/arch/m68k/lib/interrupts.c
@@ -42,7 +42,7 @@ static __inline__ void set_sr (unsigned short sr)
 /*
  * Install and free an interrupt handler
  */
-void irq_install_handler (int vec, interrupt_handler_t * handler, void *arg)
+void irq_install_handler(int vec, interrupt_handler_t * handler, void *arg)
 {
        if ((vec < 0) || (vec >= NR_IRQS)) {
                printf ("irq_install_handler: wrong interrupt vector %d\n",
@@ -54,7 +54,7 @@ void irq_install_handler (int vec, interrupt_handler_t * handler, void *arg)
        irq_vecs[vec].arg = arg;
 }
 
-void irq_free_handler (int vec)
+void irq_free_handler(int vec)
 {
        if ((vec < 0) || (vec >= NR_IRQS)) {
                return;
@@ -64,7 +64,7 @@ void irq_free_handler (int vec)
        irq_vecs[vec].arg = NULL;
 }
 
-void enable_interrupts (void)
+void enable_interrupts(void)
 {
        unsigned short sr;
 
@@ -72,7 +72,7 @@ void enable_interrupts (void)
        set_sr (sr & ~0x0700);
 }
 
-int disable_interrupts (void)
+int disable_interrupts(void)
 {
        unsigned short sr;
 

diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c
index 6b5d0724e34a10de3cdebeef4f5757698c5ccd82..96c3020935353c758444cb1cefa082fac2231af1 100644 (file)
--- a/arch/nios2/cpu/interrupts.c
+++ b/arch/nios2/cpu/interrupts.c
@@ -23,7 +23,7 @@ struct        irq_action {
 
 static struct irq_action vecs[32];
 
-int disable_interrupts (void)
+int disable_interrupts(void)
 {
        int val = rdctl (CTL_STATUS);
        wrctl (CTL_STATUS, val & ~STATUS_IE);
@@ -36,7 +36,7 @@ void enable_interrupts( void )
        wrctl (CTL_STATUS, val | STATUS_IE);
 }
 
-void external_interrupt (struct pt_regs *regs)
+void external_interrupt(struct pt_regs *regs)
 {
        unsigned irqs;
        struct irq_action *act;
@@ -73,7 +73,7 @@ static void def_hdlr (void *arg)
 }
 
 /*************************************************************************/
-void irq_install_handler (int irq, interrupt_handler_t *hdlr, void *arg)
+void irq_install_handler(int irq, interrupt_handler_t *hdlr, void *arg)
 {
 
        int flag;
@@ -84,7 +84,7 @@ void irq_install_handler (int irq, interrupt_handler_t *hdlr, void *arg)
                return;
        act = &vecs[irq];
 
-       flag = disable_interrupts ();
+       flag = disable_interrupts();
        if (hdlr) {
                act->handler = hdlr;
                act->arg = arg;
@@ -95,11 +95,11 @@ void irq_install_handler (int irq, interrupt_handler_t *hdlr, void *arg)
                ena &= ~(1 << irq);             /* disable */
        }
        wrctl (CTL_IENABLE, ena);
-       if (flag) enable_interrupts ();
+       if (flag) enable_interrupts();
 }
 
 
-int interrupt_init (void)
+int interrupt_init(void)
 {
        int i;
 
@@ -110,7 +110,7 @@ int interrupt_init (void)
                vecs[i].count = 0;
        }
 
-       enable_interrupts ();
+       enable_interrupts();
        return (0);
 }
 

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 0710f5ab36070c5a5b35811c2939f83aefbf4728..20ed82fbcdfb77abef93fb4db8b780df9aaa9dd6 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -196,7 +196,7 @@ void watchdog_reset (void)
        immr->wdt.swsrr = 0xaa39;
 
        if (re_enable)
-               enable_interrupts ();
+               enable_interrupts();
 }
 #endif
 

diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index 520c2c363e3160e6a0bf4e7919e916720174ab3a..04cd14732141e71e25f837611d41b27f9fa4f509 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
@@ -35,7 +35,7 @@ void interrupt_init_cpu (unsigned *decrementer_count)
  * Handle external interrupts
  */
 
-void external_interrupt (struct pt_regs *regs)
+void external_interrupt(struct pt_regs *regs)
 {
 }
 
@@ -45,12 +45,12 @@ void external_interrupt (struct pt_regs *regs)
  */
 
 void
-irq_install_handler (int irq, interrupt_handler_t * handler, void *arg)
+irq_install_handler(int irq, interrupt_handler_t * handler, void *arg)
 {
 }
 
 
-void irq_free_handler (int irq)
+void irq_free_handler(int irq)
 {
 }
 

diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index ed780a599d143384e33be26766d71662e5bc8d09..04c8f25af604cbecbdd24adfd4dc1ac01d34f7ce 100644 (file)
--- a/arch/powerpc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
@@ -108,5 +108,5 @@ int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  */
 void external_interrupt(struct pt_regs *regs)
 {
-       puts("external_interrupt (oops!)\n");
+       puts("external_interrupt(oops!)\n");
 }

diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 4b7f543a18016a9b432482d3dca3a0841fe66467..a58ddfa569c610951e2db13a3a874f9e70edce10 100644 (file)
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -38,13 +38,13 @@ static __inline__ void set_dec (unsigned long val)
 }
 #endif /* !CONFIG_MPC83XX_TIMER */
 
-void enable_interrupts (void)
+void enable_interrupts(void)
 {
        set_msr (get_msr () | MSR_EE);
 }
 
 /* returns flag if MSR_EE was set before */
-int disable_interrupts (void)
+int disable_interrupts(void)
 {
        ulong msr = get_msr ();
 
@@ -53,7 +53,7 @@ int disable_interrupts (void)
 }
 
 #ifndef CONFIG_MPC83XX_TIMER
-int interrupt_init (void)
+int interrupt_init(void)
 {
        /* call cpu specific function from $(CPU)/interrupts.c */
        interrupt_init_cpu (&decrementer_count);
@@ -67,7 +67,7 @@ int interrupt_init (void)
 
 static volatile ulong timestamp = 0;
 
-void timer_interrupt (struct pt_regs *regs)
+void timer_interrupt(struct pt_regs *regs)
 {
        /* call cpu specific function from $(CPU)/interrupts.c */
        timer_interrupt_cpu (regs);

diff --git a/arch/sh/cpu/sh4/interrupts.c b/arch/sh/cpu/sh4/interrupts.c
index ff7470ecccb1781aae6b74b60fc247db5d2fce49..5982aad54ebd5e84f7e67b42a9b2c564f17ab1d9 100644 (file)
--- a/arch/sh/cpu/sh4/interrupts.c
+++ b/arch/sh/cpu/sh4/interrupts.c
@@ -6,16 +6,16 @@
 
 #include <common.h>
 
-int interrupt_init (void)
+int interrupt_init(void)
 {
        return 0;
 }
 
-void enable_interrupts (void)
+void enable_interrupts(void)
 {
 
 }
 
-int disable_interrupts (void){
+int disable_interrupts(void){
        return 0;
 }

diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index ea3ed735157d26cd6b3bdf09615cbc1e300cc439..6f36c269d42a4c4ed0803c6f148bfa5ea6bd7c78 100644 (file)
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -167,7 +167,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
 
        cflag = icache_status();
        icache_disable();
-       iflag = disable_interrupts ();
+       iflag = disable_interrupts();
 
        printf ("\n");
 
@@ -235,7 +235,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
        udelay (10000);
 
        if (iflag)
-               enable_interrupts ();
+               enable_interrupts();
 
        if (cflag)
                icache_enable();
@@ -270,7 +270,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
 
        cflag = icache_status();
        icache_disable();
-       iflag = disable_interrupts ();
+       iflag = disable_interrupts();
 
        MEM_FLASH_ADDR1 = CMD_UNLOCK1;
        MEM_FLASH_ADDR2 = CMD_UNLOCK2;
@@ -301,7 +301,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
                rc = ERR_PROG_ERROR;
 
        if (iflag)
-               enable_interrupts ();
+               enable_interrupts();
 
        if (cflag)
                icache_enable();