1 files changed, 92 insertions, 92 deletions

diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c
index e775706c60e3..c9c98f071af6 100644
--- a/drivers/isdn/hisax/bkm_a8.c
+++ b/drivers/isdn/hisax/bkm_a8.c
@@ -4,7 +4,7 @@
  *
  * Author       Roland Klabunde
  * Copyright    by Roland Klabunde   <R.Klabunde@Berkom.de>
- * 
+ *
  * This software may be used and distributed according to the terms
  * of the GNU General Public License, incorporated herein by reference.
  *
@@ -34,7 +34,7 @@ static const char *sct_quadro_subtypes[] =
 };
 
 
-#define wordout(addr,val) outw(val,addr)
+#define wordout(addr, val) outw(val, addr)
 #define wordin(addr) inw(addr)
 
 static inline u_char
@@ -47,7 +47,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)
 {
         int i;
         wordout(ale, off);
@@ -64,7 +64,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)
 {
         int i;
         wordout(ale, off);
@@ -87,13 +87,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.ax.base, cs->hw.ax.data_adr, 0x80, 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.ax.base, cs->hw.ax.data_adr, 0x80, data, size);
 }
@@ -117,21 +117,21 @@ set_ipac_active(struct IsdnCardState *cs, u_int active)
 {
         /* set irq mask */
         writereg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_MASK,
-                active ? 0xc0 : 0xff);
+                 active ? 0xc0 : 0xff);
 }
 
 /*
  * fast interrupt HSCX stuff goes here
  */
 
-#define READHSCX(cs, nr, reg) readreg(cs->hw.ax.base, \
-        cs->hw.ax.data_adr, reg + (nr ? 0x40 : 0))
-#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.ax.base, \
-        cs->hw.ax.data_adr, reg + (nr ? 0x40 : 0), data)
-#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ax.base, \
-        cs->hw.ax.data_adr, (nr ? 0x40 : 0), ptr, cnt)
-#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.ax.base, \
-        cs->hw.ax.data_adr, (nr ? 0x40 : 0), ptr, cnt)
+#define READHSCX(cs, nr, reg) readreg(cs->hw.ax.base,                   \
+                                      cs->hw.ax.data_adr, reg + (nr ? 0x40 : 0))
+#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.ax.base,           \
+                                              cs->hw.ax.data_adr, reg + (nr ? 0x40 : 0), data)
+#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ax.base,         \
+                                                cs->hw.ax.data_adr, (nr ? 0x40 : 0), ptr, cnt)
+#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.ax.base,       \
+                                                  cs->hw.ax.data_adr, (nr ? 0x40 : 0), ptr, cnt)
 
 #include "hscx_irq.c"
 
@@ -148,7 +148,7 @@ bkm_interrupt_ipac(int intno, void *dev_id)
                 spin_unlock_irqrestore(&cs->lock, flags);
                 return IRQ_NONE;
         }
-      Start_IPAC:
+Start_IPAC:
         if (cs->debug & L1_DEB_IPAC)
                 debugl1(cs, "IPAC ISTA %02X", ista);
         if (ista & 0x0f) {
@@ -224,33 +224,33 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
         u_long flags;
 
         switch (mt) {
-                case CARD_RESET:
-                        spin_lock_irqsave(&cs->lock, flags);
-                        /* Disable ints */
-                        set_ipac_active(cs, 0);
-                        enable_bkm_int(cs, 0);
-                        reset_bkm(cs);
-                        spin_unlock_irqrestore(&cs->lock, flags);
-                        return (0);
-                case CARD_RELEASE:
-                        /* Sanity */
-                        spin_lock_irqsave(&cs->lock, flags);
-                        set_ipac_active(cs, 0);
-                        enable_bkm_int(cs, 0);
-                        spin_unlock_irqrestore(&cs->lock, flags);
-                        release_io_sct_quadro(cs);
-                        return (0);
-                case CARD_INIT:
-                        spin_lock_irqsave(&cs->lock, flags);
-                        cs->debug |= L1_DEB_IPAC;
-                        set_ipac_active(cs, 1);
-                        inithscxisac(cs, 3);
-                        /* Enable ints */
-                        enable_bkm_int(cs, 1);
-                        spin_unlock_irqrestore(&cs->lock, flags);
-                        return (0);
-                case CARD_TEST:
-                        return (0);
+        case CARD_RESET:
+                spin_lock_irqsave(&cs->lock, flags);
+                /* Disable ints */
+                set_ipac_active(cs, 0);
+                enable_bkm_int(cs, 0);
+                reset_bkm(cs);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                return (0);
+        case CARD_RELEASE:
+                /* Sanity */
+                spin_lock_irqsave(&cs->lock, flags);
+                set_ipac_active(cs, 0);
+                enable_bkm_int(cs, 0);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                release_io_sct_quadro(cs);
+                return (0);
+        case CARD_INIT:
+                spin_lock_irqsave(&cs->lock, flags);
+                cs->debug |= L1_DEB_IPAC;
+                set_ipac_active(cs, 1);
+                inithscxisac(cs, 3);
+                /* Enable ints */
+                enable_bkm_int(cs, 1);
+                spin_unlock_irqrestore(&cs->lock, flags);
+                return (0);
+        case CARD_TEST:
+                return (0);
         }
         return (0);
 }
@@ -260,11 +260,11 @@ sct_alloc_io(u_int adr, u_int len)
 {
         if (!request_region(adr, len, "scitel")) {
                 printk(KERN_WARNING
-                        "HiSax: Scitel port %#x-%#x already in use\n",
-                        adr, adr + len);
+                       "HiSax: Scitel port %#x-%#x already in use\n",
+                       adr, adr + len);
                 return (1);
         }
-        return(0);
+        return (0);
 }
 
 static struct pci_dev *dev_a8 __devinitdata = NULL;
@@ -298,18 +298,18 @@ setup_sct_quadro(struct IsdnCard *card)
                 return (0);
         }
         if ((cs->subtyp != SCT_1) && ((sub_sys_id != PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO) ||
-                (sub_vendor_id != PCI_VENDOR_ID_BERKOM)))
+                                      (sub_vendor_id != PCI_VENDOR_ID_BERKOM)))
                 return (0);
         if (cs->subtyp == SCT_1) {
                 while ((dev_a8 = hisax_find_pci_device(PCI_VENDOR_ID_PLX,
-                        PCI_DEVICE_ID_PLX_9050, dev_a8))) {
-                        
+                                                       PCI_DEVICE_ID_PLX_9050, dev_a8))) {
+
                         sub_vendor_id = dev_a8->subsystem_vendor;
                         sub_sys_id = dev_a8->subsystem_device;
                         if ((sub_sys_id == PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO) &&
-                                (sub_vendor_id == PCI_VENDOR_ID_BERKOM)) {
+                            (sub_vendor_id == PCI_VENDOR_ID_BERKOM)) {
                                 if (pci_enable_device(dev_a8))
-                                        return(0);
+                                        return (0);
                                 pci_ioaddr1 = pci_resource_start(dev_a8, 1);
                                 pci_irq = dev_a8->irq;
                                 pci_bus = dev_a8->bus->number;
@@ -320,23 +320,23 @@ setup_sct_quadro(struct IsdnCard *card)
                 }
                 if (!found) {
                         printk(KERN_WARNING "HiSax: Scitel Quadro (%s): "
-                                "Card not found\n",
-                                sct_quadro_subtypes[cs->subtyp]);
+                               "Card not found\n",
+                               sct_quadro_subtypes[cs->subtyp]);
                         return (0);
                 }
 #ifdef ATTEMPT_PCI_REMAPPING
 /* HACK: PLX revision 1 bug: PLX address bit 7 must not be set */
                 if ((pci_ioaddr1 & 0x80) && (dev_a8->revision == 1)) {
                         printk(KERN_WARNING "HiSax: Scitel Quadro (%s): "
-                                "PLX rev 1, remapping required!\n",
-                                sct_quadro_subtypes[cs->subtyp]);
+                               "PLX rev 1, remapping required!\n",
+                               sct_quadro_subtypes[cs->subtyp]);
                         /* Restart PCI negotiation */
-                        pci_write_config_dword(dev_a8, PCI_BASE_ADDRESS_1, (u_int) - 1);
+                        pci_write_config_dword(dev_a8, PCI_BASE_ADDRESS_1, (u_int)-1);
                         /* Move up by 0x80 byte */
                         pci_ioaddr1 += 0x80;
                         pci_ioaddr1 &= PCI_BASE_ADDRESS_IO_MASK;
                         pci_write_config_dword(dev_a8, PCI_BASE_ADDRESS_1, pci_ioaddr1);
-                        dev_a8->resource[ 1].start = pci_ioaddr1;
+                        dev_a8->resource[1].start = pci_ioaddr1;
                 }
 #endif /* End HACK */
         }
@@ -371,39 +371,39 @@ setup_sct_quadro(struct IsdnCard *card)
         /* pci_ioaddr5 is for the first subdevice only */
         cs->hw.ax.plx_adr = pci_ioaddr1;
         /* Enter all ipac_base addresses */
-        switch(cs->subtyp) {
-                case 1:
-                        cs->hw.ax.base = pci_ioaddr5 + 0x00;
-                        if (sct_alloc_io(pci_ioaddr1, 128))
-                                return(0);
-                        if (sct_alloc_io(pci_ioaddr5, 64))
-                                return(0);
-                        /* disable all IPAC */
-                        writereg(pci_ioaddr5, pci_ioaddr5 + 4,
-                                IPAC_MASK, 0xFF);
-                        writereg(pci_ioaddr4 + 0x08, pci_ioaddr4 + 0x0c,
-                                IPAC_MASK, 0xFF);
-                        writereg(pci_ioaddr3 + 0x10, pci_ioaddr3 + 0x14,
-                                IPAC_MASK, 0xFF);
-                        writereg(pci_ioaddr2 + 0x20, pci_ioaddr2 + 0x24,
-                                IPAC_MASK, 0xFF);
-                        break;
-                case 2:
-                        cs->hw.ax.base = pci_ioaddr4 + 0x08;
-                        if (sct_alloc_io(pci_ioaddr4, 64))
-                                return(0);
-                        break;
-                case 3:
-                        cs->hw.ax.base = pci_ioaddr3 + 0x10;
-                        if (sct_alloc_io(pci_ioaddr3, 64))
-                                return(0);
-                        break;
-                case 4:
-                        cs->hw.ax.base = pci_ioaddr2 + 0x20;
-                        if (sct_alloc_io(pci_ioaddr2, 64))
-                                return(0);
-                        break;
-        }       
+        switch (cs->subtyp) {
+        case 1:
+                cs->hw.ax.base = pci_ioaddr5 + 0x00;
+                if (sct_alloc_io(pci_ioaddr1, 128))
+                        return (0);
+                if (sct_alloc_io(pci_ioaddr5, 64))
+                        return (0);
+                /* disable all IPAC */
+                writereg(pci_ioaddr5, pci_ioaddr5 + 4,
+                         IPAC_MASK, 0xFF);
+                writereg(pci_ioaddr4 + 0x08, pci_ioaddr4 + 0x0c,
+                         IPAC_MASK, 0xFF);
+                writereg(pci_ioaddr3 + 0x10, pci_ioaddr3 + 0x14,
+                         IPAC_MASK, 0xFF);
+                writereg(pci_ioaddr2 + 0x20, pci_ioaddr2 + 0x24,
+                         IPAC_MASK, 0xFF);
+                break;
+        case 2:
+                cs->hw.ax.base = pci_ioaddr4 + 0x08;
+                if (sct_alloc_io(pci_ioaddr4, 64))
+                        return (0);
+                break;
+        case 3:
+                cs->hw.ax.base = pci_ioaddr3 + 0x10;
+                if (sct_alloc_io(pci_ioaddr3, 64))
+                        return (0);
+                break;
+        case 4:
+                cs->hw.ax.base = pci_ioaddr2 + 0x20;
+                if (sct_alloc_io(pci_ioaddr2, 64))
+                        return (0);
+                break;
+        }
         /* For isac and hscx data path */
         cs->hw.ax.data_adr = cs->hw.ax.base + 4;
 
@@ -429,7 +429,7 @@ setup_sct_quadro(struct IsdnCard *card)
         cs->irq_func = &bkm_interrupt_ipac;
 
         printk(KERN_INFO "HiSax: Scitel Quadro (%s): IPAC Version %d\n",
-                sct_quadro_subtypes[cs->subtyp],
-                readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ID));
+               sct_quadro_subtypes[cs->subtyp],
+               readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ID));
         return (1);
 }