isdn: whitespace coding style cleanup

isdn source code uses a not-current coding style.

Update the coding style used on a per-line basis
so that git diff -w shows only elided blank lines
at EOF.

Done with emacs and some scripts and some typing.

Built x86 allyesconfig.
No detected change in objdump -d or size.

Signed-off-by: Joe Perches <joe@perches.com>

1 files changed, 61 insertions, 61 deletions

diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c
index b34a81d655b8..75dcae6d36e0 100644
--- a/drivers/isdn/hisax/saphir.c
+++ b/drivers/isdn/hisax/saphir.c
@@ -4,7 +4,7 @@
  *
  * Author       Karsten Keil
  * Copyright    by Karsten Keil      <keil@isdn4linux.de>
- * 
+ *
  * This software may be used and distributed according to the terms
  * of the GNU General Public License, incorporated herein by reference.
  *
@@ -20,7 +20,7 @@
 
 static char *saphir_rev = "$Revision: 1.10.2.4 $";
 
-#define byteout(addr,val) outb(val,addr)
+#define byteout(addr, val) outb(val, addr)
 #define bytein(addr) inb(addr)
 
 #define ISAC_DATA       0
@@ -41,7 +41,7 @@ readreg(unsigned int ale, unsigned int adr, u_char off)
 }
 
 static inline void
-readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size)
+readfifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size)
 {
         byteout(ale, off);
         insb(adr, data, size);
@@ -56,7 +56,7 @@ writereg(unsigned int ale, unsigned int adr, u_char off, u_char data)
 }
 
 static inline void
-writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size)
+writefifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size)
 {
         byteout(ale, off);
         outsb(adr, data, size);
@@ -77,13 +77,13 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)
 }
 
 static void
-ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size)
+ReadISACfifo(struct IsdnCardState *cs, u_char *data, int size)
 {
         readfifo(cs->hw.saphir.ale, cs->hw.saphir.isac, 0, data, size);
 }
 
 static void
-WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size)
+WriteISACfifo(struct IsdnCardState *cs, u_char *data, int size)
 {
         writefifo(cs->hw.saphir.ale, cs->hw.saphir.isac, 0, data, size);
 }
@@ -92,26 +92,26 @@ static u_char
 ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset)
 {
         return (readreg(cs->hw.saphir.ale, cs->hw.saphir.hscx,
-                offset + (hscx ? 0x40 : 0)));
+                        offset + (hscx ? 0x40 : 0)));
 }
 
 static void
 WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
 {
         writereg(cs->hw.saphir.ale, cs->hw.saphir.hscx,
-                offset + (hscx ? 0x40 : 0), value);
+                 offset + (hscx ? 0x40 : 0), value);
 }
 
-#define READHSCX(cs, nr, reg) readreg(cs->hw.saphir.ale, \
-                cs->hw.saphir.hscx, reg + (nr ? 0x40 : 0))
-#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.saphir.ale, \
-                cs->hw.saphir.hscx, reg + (nr ? 0x40 : 0), data)
+#define READHSCX(cs, nr, reg) readreg(cs->hw.saphir.ale,                \
+                                      cs->hw.saphir.hscx, reg + (nr ? 0x40 : 0))
+#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.saphir.ale,        \
+                                              cs->hw.saphir.hscx, reg + (nr ? 0x40 : 0), data)
 
-#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.saphir.ale, \
-                cs->hw.saphir.hscx, (nr ? 0x40 : 0), ptr, cnt)
+#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.saphir.ale,      \
+                                                cs->hw.saphir.hscx, (nr ? 0x40 : 0), ptr, cnt)
 
-#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.saphir.ale, \
-                cs->hw.saphir.hscx, (nr ? 0x40 : 0), ptr, cnt)
+#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.saphir.ale,    \
+                                                  cs->hw.saphir.hscx, (nr ? 0x40 : 0), ptr, cnt)
 
 #include "hscx_irq.c"
 
@@ -124,11 +124,11 @@ saphir_interrupt(int intno, void *dev_id)
 
         spin_lock_irqsave(&cs->lock, flags);
         val = readreg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_ISTA + 0x40);
-      Start_HSCX:
+Start_HSCX:
         if (val)
                 hscx_int_main(cs, val);
         val = readreg(cs->hw.saphir.ale, cs->hw.saphir.isac, ISAC_ISTA);
-      Start_ISAC:
+Start_ISAC:
         if (val)
                 isac_interrupt(cs, val);
         val = readreg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_ISTA + 0x40);
@@ -144,8 +144,8 @@ saphir_interrupt(int intno, void *dev_id)
                 goto Start_ISAC;
         }
         /* Watchdog */
-        if (cs->hw.saphir.timer.function) 
-                mod_timer(&cs->hw.saphir.timer, jiffies+1*HZ);
+        if (cs->hw.saphir.timer.function)
+                mod_timer(&cs->hw.saphir.timer, jiffies + 1 * HZ);
         else
                 printk(KERN_WARNING "saphir: Spurious timer!\n");
         writereg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_MASK, 0xFF);
@@ -164,10 +164,10 @@ SaphirWatchDog(struct IsdnCardState *cs)
         u_long flags;
 
         spin_lock_irqsave(&cs->lock, flags);
-        /* 5 sec WatchDog, so read at least every 4 sec */
+        /* 5 sec WatchDog, so read at least every 4 sec */
         cs->readisac(cs, ISAC_RBCH);
         spin_unlock_irqrestore(&cs->lock, flags);
-        mod_timer(&cs->hw.saphir.timer, jiffies+1*HZ);
+        mod_timer(&cs->hw.saphir.timer, jiffies + 1 * HZ);
 }
 
 static void
@@ -185,24 +185,24 @@ saphir_reset(struct IsdnCardState *cs)
 {
         u_char irq_val;
 
-        switch(cs->irq) {
-                case 5: irq_val = 0;
-                        break;
-                case 3: irq_val = 1;
-                        break;
-                case 11:
-                        irq_val = 2;
-                        break;
-                case 12:
-                        irq_val = 3;
-                        break;
-                case 15:
-                        irq_val = 4;
-                        break;
-                default:
-                        printk(KERN_WARNING "HiSax: saphir wrong IRQ %d\n",
-                                cs->irq);
-                        return (1);
+        switch (cs->irq) {
+        case 5: irq_val = 0;
+                break;
+        case 3: irq_val = 1;
+                break;
+        case 11:
+                irq_val = 2;
+                break;
+        case 12:
+                irq_val = 3;
+                break;
+        case 15:
+                irq_val = 4;
+                break;
+        default:
+                printk(KERN_WARNING "HiSax: saphir wrong IRQ %d\n",
+                       cs->irq);
+                return (1);
         }
         byteout(cs->hw.saphir.cfg_reg + IRQ_REG, irq_val);
         byteout(cs->hw.saphir.cfg_reg + RESET_REG, 1);
@@ -220,23 +220,23 @@ saphir_card_msg(struct IsdnCardState *cs, int mt, void *arg)
         u_long flags;
 
         switch (mt) {
-                case CARD_RESET:
-                        spin_lock_irqsave(&cs->lock, flags);
-                        saphir_reset(cs);
-                        spin_unlock_irqrestore(&cs->lock, flags);
-                        return(0);
-                case CARD_RELEASE:
-                        release_io_saphir(cs);
-                        return(0);
-                case CARD_INIT:
-                        spin_lock_irqsave(&cs->lock, flags);
-                        inithscxisac(cs, 3);
-                        spin_unlock_irqrestore(&cs->lock, flags);
-                        return(0);
-                case CARD_TEST:
-                        return(0);
+        case CARD_RESET:
+                spin_lock_irqsave(&cs->lock, flags);
+                saphir_reset(cs);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                return (0);
+        case CARD_RELEASE:
+                release_io_saphir(cs);
+                return (0);
+        case CARD_INIT:
+                spin_lock_irqsave(&cs->lock, flags);
+                inithscxisac(cs, 3);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                return (0);
+        case CARD_TEST:
+                return (0);
         }
-        return(0);
+        return (0);
 }
 
 
@@ -259,9 +259,9 @@ setup_saphir(struct IsdnCard *card)
         cs->irq = card->para[0];
         if (!request_region(cs->hw.saphir.cfg_reg, 6, "saphir")) {
                 printk(KERN_WARNING
-                        "HiSax: HST Saphir config port %x-%x already in use\n",
-                        cs->hw.saphir.cfg_reg,
-                        cs->hw.saphir.cfg_reg + 5);
+                       "HiSax: HST Saphir config port %x-%x already in use\n",
+                       cs->hw.saphir.cfg_reg,
+                       cs->hw.saphir.cfg_reg + 5);
                 return (0);
         }
 
@@ -272,7 +272,7 @@ setup_saphir(struct IsdnCard *card)
         cs->hw.saphir.timer.function = (void *) SaphirWatchDog;
         cs->hw.saphir.timer.data = (long) cs;
         init_timer(&cs->hw.saphir.timer);
-        cs->hw.saphir.timer.expires = jiffies + 4*HZ;
+        cs->hw.saphir.timer.expires = jiffies + 4 * HZ;
         add_timer(&cs->hw.saphir.timer);
         if (saphir_reset(cs)) {
                 release_io_saphir(cs);
@@ -290,7 +290,7 @@ setup_saphir(struct IsdnCard *card)
         ISACVersion(cs, "saphir:");
         if (HscxVersion(cs, "saphir:")) {
                 printk(KERN_WARNING
-                    "saphir: wrong HSCX versions check IO address\n");
+                       "saphir: wrong HSCX versions check IO address\n");
                 release_io_saphir(cs);
                 return (0);
         }