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

[karo-tx-linux.git] / drivers / isdn / hisax / teles0.c

diff --git a/drivers/isdn/hisax/teles0.c b/drivers/isdn/hisax/teles0.c
index 3ca0bed1b88cab005b8a899b109ec03632038248..49b4a26f91e018be2490c5abf0afee7e65d4bb74 100644 (file)
--- a/drivers/isdn/hisax/teles0.c
+++ b/drivers/isdn/hisax/teles0.c
@@ -5,7 +5,7 @@
  * Author       Karsten Keil
  *              based on the teles driver from Jan den Ouden
  * 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.
  *
@@ -24,7 +24,7 @@
 static const char *teles0_revision = "$Revision: 2.15.2.4 $";
 
 #define TELES_IOMEM_SIZE       0x400
-#define byteout(addr,val) outb(val,addr)
+#define byteout(addr, val) outb(val, addr)
 #define bytein(addr) inb(addr)
 
 static inline u_char
@@ -55,7 +55,7 @@ writehscx(void __iomem *adr, int hscx, u_char off, u_char data)
 }
 
 static inline void
-read_fifo_isac(void __iomem *adr, u_char * data, int size)
+read_fifo_isac(void __iomem *adr, u_char *data, int size)
 {
        register int i;
        register u_char __iomem *ad = adr + 0x100;
@@ -64,7 +64,7 @@ read_fifo_isac(void __iomem *adr, u_char * data, int size)
 }
 
 static inline void
-write_fifo_isac(void __iomem *adr, u_char * data, int size)
+write_fifo_isac(void __iomem *adr, u_char *data, int size)
 {
        register int i;
        register u_char __iomem *ad = adr + 0x100;
@@ -74,7 +74,7 @@ write_fifo_isac(void __iomem *adr, u_char * data, int size)
 }
 
 static inline void
-read_fifo_hscx(void __iomem *adr, int hscx, u_char * data, int size)
+read_fifo_hscx(void __iomem *adr, int hscx, u_char *data, int size)
 {
        register int i;
        register u_char __iomem *ad = adr + (hscx ? 0x1c0 : 0x180);
@@ -83,7 +83,7 @@ read_fifo_hscx(void __iomem *adr, int hscx, u_char * data, int size)
 }
 
 static inline void
-write_fifo_hscx(void __iomem *adr, int hscx, u_char * data, int size)
+write_fifo_hscx(void __iomem *adr, int hscx, u_char *data, int size)
 {
        int i;
        register u_char __iomem *ad = adr + (hscx ? 0x1c0 : 0x180);
@@ -107,13 +107,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)
 {
        read_fifo_isac(cs->hw.teles0.membase, data, size);
 }
 
 static void
-WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size)
+WriteISACfifo(struct IsdnCardState *cs, u_char *data, int size)
 {
        write_fifo_isac(cs->hw.teles0.membase, data, size);
 }
@@ -151,11 +151,11 @@ teles0_interrupt(int intno, void *dev_id)
 
        spin_lock_irqsave(&cs->lock, flags);
        val = readhscx(cs->hw.teles0.membase, 1, HSCX_ISTA);
-      Start_HSCX:
+Start_HSCX:
        if (val)
                hscx_int_main(cs, val);
        val = readisac(cs->hw.teles0.membase, ISAC_ISTA);
-      Start_ISAC:
+Start_ISAC:
        if (val)
                isac_interrupt(cs, val);
        count++;
@@ -197,33 +197,33 @@ reset_teles0(struct IsdnCardState *cs)
 
        if (cs->hw.teles0.cfg_reg) {
                switch (cs->irq) {
-                       case 2:
-                       case 9:
-                               cfval = 0x00;
-                               break;
-                       case 3:
-                               cfval = 0x02;
-                               break;
-                       case 4:
-                               cfval = 0x04;
-                               break;
-                       case 5:
-                               cfval = 0x06;
-                               break;
-                       case 10:
-                               cfval = 0x08;
-                               break;
-                       case 11:
-                               cfval = 0x0A;
-                               break;
-                       case 12:
-                               cfval = 0x0C;
-                               break;
-                       case 15:
-                               cfval = 0x0E;
-                               break;
-                       default:
-                               return(1);
+               case 2:
+               case 9:
+                       cfval = 0x00;
+                       break;
+               case 3:
+                       cfval = 0x02;
+                       break;
+               case 4:
+                       cfval = 0x04;
+                       break;
+               case 5:
+                       cfval = 0x06;
+                       break;
+               case 10:
+                       cfval = 0x08;
+                       break;
+               case 11:
+                       cfval = 0x0A;
+                       break;
+               case 12:
+                       cfval = 0x0C;
+                       break;
+               case 15:
+                       cfval = 0x0E;
+                       break;
+               default:
+                       return (1);
                }
                cfval |= ((cs->hw.teles0.phymem >> 9) & 0xF0);
                byteout(cs->hw.teles0.cfg_reg + 4, cfval);
@@ -235,7 +235,7 @@ reset_teles0(struct IsdnCardState *cs)
        HZDELAY(HZ / 5 + 1);
        writeb(1, cs->hw.teles0.membase + 0x80); mb();
        HZDELAY(HZ / 5 + 1);
-       return(0);
+       return (0);
 }
 
 static int
@@ -244,23 +244,23 @@ Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg)
        u_long flags;
 
        switch (mt) {
-               case CARD_RESET:
-                       spin_lock_irqsave(&cs->lock, flags);
-                       reset_teles0(cs);
-                       spin_unlock_irqrestore(&cs->lock, flags);
-                       return(0);
-               case CARD_RELEASE:
-                       release_io_teles0(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);
+               reset_teles0(cs);
+               spin_unlock_irqrestore(&cs->lock, flags);
+               return (0);
+       case CARD_RELEASE:
+               release_io_teles0(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);
 }
 
 int __devinit
@@ -283,14 +283,14 @@ setup_teles0(struct IsdnCard *card)
        if (card->para[1] < 0x10000) {
                card->para[1] <<= 4;
                printk(KERN_INFO
-                  "Teles0: membase configured DOSish, assuming 0x%lx\n",
+                      "Teles0: membase configured DOSish, assuming 0x%lx\n",
                       (unsigned long) card->para[1]);
        }
        cs->irq = card->para[0];
        if (cs->hw.teles0.cfg_reg) {
                if (!request_region(cs->hw.teles0.cfg_reg, 8, "teles cfg")) {
                        printk(KERN_WARNING
-                         "HiSax: %s config port %x-%x already in use\n",
+                              "HiSax: %s config port %x-%x already in use\n",
                               CardType[card->typ],
                               cs->hw.teles0.cfg_reg,
                               cs->hw.teles0.cfg_reg + 8);
@@ -311,8 +311,8 @@ setup_teles0(struct IsdnCard *card)
                        return (0);
                }
                val = bytein(cs->hw.teles0.cfg_reg + 2);        /* 0x1e=without AB
-                                                                  * 0x1f=with AB
-                                                                  * 0x1c 16.3 ???
+                                                                * 0x1f=with AB
+                                                                * 0x1c 16.3 ???
                                                                 */
                if (val != 0x1e && val != 0x1f) {
                        printk(KERN_WARNING "Teles0: 16.0 Byte at %x is %x\n",
@@ -326,10 +326,10 @@ setup_teles0(struct IsdnCard *card)
        cs->hw.teles0.phymem = card->para[1];
        if (!request_mem_region(cs->hw.teles0.phymem, TELES_IOMEM_SIZE, "teles iomem")) {
                printk(KERN_WARNING
-                       "HiSax: %s memory region %lx-%lx already in use\n",
-                       CardType[card->typ],
-                       cs->hw.teles0.phymem,
-                       cs->hw.teles0.phymem + TELES_IOMEM_SIZE);
+                      "HiSax: %s memory region %lx-%lx already in use\n",
+                      CardType[card->typ],
+                      cs->hw.teles0.phymem,
+                      cs->hw.teles0.phymem + TELES_IOMEM_SIZE);
                if (cs->hw.teles0.cfg_reg)
                        release_region(cs->hw.teles0.cfg_reg, 8);
                return (0);
@@ -357,7 +357,7 @@ setup_teles0(struct IsdnCard *card)
        ISACVersion(cs, "Teles0:");
        if (HscxVersion(cs, "Teles0:")) {
                printk(KERN_WARNING
-                "Teles0: wrong HSCX versions check IO/MEM addresses\n");
+                      "Teles0: wrong HSCX versions check IO/MEM addresses\n");
                release_io_teles0(cs);
                return (0);
        }