1 files changed, 86 insertions, 86 deletions

diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index aff45a11a92d..6ead6314e6d2 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -133,15 +133,15 @@ extern const char *tei_revision;
 
 /* include l3dss1 & ni1 specific process structures, but no other defines */
 #ifdef CONFIG_HISAX_EURO
-  #define l3dss1_process
-  #include "l3dss1.h" 
-  #undef  l3dss1_process
+#define l3dss1_process
+#include "l3dss1.h"
+#undef  l3dss1_process
 #endif /* CONFIG_HISAX_EURO */
 
 #ifdef CONFIG_HISAX_NI1
-  #define l3ni1_process
-  #include "l3ni1.h" 
-  #undef  l3ni1_process
+#define l3ni1_process
+#include "l3ni1.h"
+#undef  l3ni1_process
 #endif /* CONFIG_HISAX_NI1 */
 
 #define MAX_DFRAME_LEN  260
@@ -149,7 +149,7 @@ extern const char *tei_revision;
 #define HSCX_BUFMAX     4096
 #define MAX_DATA_SIZE   (HSCX_BUFMAX - 4)
 #define MAX_DATA_MEM    (HSCX_BUFMAX + 64)
-#define RAW_BUFMAX      (((HSCX_BUFMAX*6)/5) + 5)
+#define RAW_BUFMAX      (((HSCX_BUFMAX * 6) / 5) + 5)
 #define MAX_HEADER_LEN  4
 #define MAX_WINDOW      8
 #define MAX_MON_FRAME   32
@@ -165,7 +165,7 @@ extern const char *tei_revision;
 
 struct FsmInst;
 
-typedef void (* FSMFNPTR)(struct FsmInst *, int, void *);
+typedef void (*FSMFNPTR)(struct FsmInst *, int, void *);
 
 struct Fsm {
         FSMFNPTR *jumpmatrix;
@@ -272,10 +272,10 @@ struct Layer2 {
 
 struct Layer3 {
         void (*l3l4) (struct PStack *, int, void *);
-        void (*l3ml3) (struct PStack *, int, void *);
+        void (*l3ml3) (struct PStack *, int, void *);
         void (*l3l2) (struct PStack *, int, void *);
         struct FsmInst l3m;
-        struct FsmTimer l3m_timer;
+        struct FsmTimer l3m_timer;
         struct sk_buff_head squeue;
         struct l3_process *proc;
         struct l3_process *global;
@@ -286,7 +286,7 @@ struct Layer3 {
 
 struct LLInterface {
         void (*l4l3) (struct PStack *, int, void *);
-        int  (*l4l3_proto) (struct PStack *, isdn_ctrl *);
+        int  (*l4l3_proto) (struct PStack *, isdn_ctrl *);
         void *userdata;
         u_long flag;
 };
@@ -325,16 +325,16 @@ struct PStack {
         struct Management ma;
         int protocol;           /* EDSS1, 1TR6 or NI1 */
 
-        /* protocol specific data fields */
-        union
-         { u_char uuuu; /* only as dummy */
+        /* protocol specific data fields */
+        union
+        { u_char uuuu; /* only as dummy */
 #ifdef CONFIG_HISAX_EURO
-           dss1_stk_priv dss1; /* private dss1 data */
-#endif /* CONFIG_HISAX_EURO */              
+                dss1_stk_priv dss1; /* private dss1 data */
+#endif /* CONFIG_HISAX_EURO */
 #ifdef CONFIG_HISAX_NI1
-           ni1_stk_priv ni1; /* private ni1 data */
-#endif /* CONFIG_HISAX_NI1 */             
-         } prot;
+                ni1_stk_priv ni1; /* private ni1 data */
+#endif /* CONFIG_HISAX_NI1 */
+        } prot;
 };
 
 struct l3_process {
@@ -347,18 +347,18 @@ struct l3_process {
         struct Channel *chan;
         struct PStack *st;
         struct l3_process *next;
-        ulong redir_result;
-
-        /* protocol specific data fields */
-        union 
-         { u_char uuuu; /* only when euro not defined, avoiding empty union */
-#ifdef CONFIG_HISAX_EURO 
-           dss1_proc_priv dss1; /* private dss1 data */
-#endif /* CONFIG_HISAX_EURO */            
+        ulong redir_result;
+
+        /* protocol specific data fields */
+        union
+        { u_char uuuu; /* only when euro not defined, avoiding empty union */
+#ifdef CONFIG_HISAX_EURO
+                dss1_proc_priv dss1; /* private dss1 data */
+#endif /* CONFIG_HISAX_EURO */
 #ifdef CONFIG_HISAX_NI1
-           ni1_proc_priv ni1; /* private ni1 data */
-#endif /* CONFIG_HISAX_NI1 */             
-         } prot;
+                ni1_proc_priv ni1; /* private ni1 data */
+#endif /* CONFIG_HISAX_NI1 */
+        } prot;
 };
 
 struct hscx_hw {
@@ -642,7 +642,7 @@ struct hfc_hw {
         unsigned char cip;
         u_char isac_spcr;
         struct timer_list timer;
-};      
+};
 
 struct sedl_hw {
         unsigned int cfg_reg;
@@ -693,25 +693,25 @@ struct hfcPCI_hw {
         unsigned char int_m2;
         unsigned char int_s1;
         unsigned char sctrl;
-        unsigned char sctrl_r;
-        unsigned char sctrl_e;
-        unsigned char trm;
+        unsigned char sctrl_r;
+        unsigned char sctrl_e;
+        unsigned char trm;
         unsigned char stat;
         unsigned char fifo;
-        unsigned char fifo_en;
-        unsigned char bswapped;
-        unsigned char nt_mode;
-        int nt_timer;
-        struct pci_dev *dev;
-        unsigned char *pci_io; /* start of PCI IO memory */
+        unsigned char fifo_en;
+        unsigned char bswapped;
+        unsigned char nt_mode;
+        int nt_timer;
+        struct pci_dev *dev;
+        unsigned char *pci_io; /* start of PCI IO memory */
         dma_addr_t dma; /* dma handle for Fifos */
-        void *fifos; /* FIFO memory */ 
-        int last_bfifo_cnt[2]; /* marker saving last b-fifo frame count */
+        void *fifos; /* FIFO memory */
+        int last_bfifo_cnt[2]; /* marker saving last b-fifo frame count */
         struct timer_list timer;
 };
 
 struct hfcSX_hw {
-        unsigned long base;
+        unsigned long base;
         unsigned char cirm;
         unsigned char ctmt;
         unsigned char conn;
@@ -720,18 +720,18 @@ struct hfcSX_hw {
         unsigned char int_m2;
         unsigned char int_s1;
         unsigned char sctrl;
-        unsigned char sctrl_r;
-        unsigned char sctrl_e;
-        unsigned char trm;
+        unsigned char sctrl_r;
+        unsigned char sctrl_e;
+        unsigned char trm;
         unsigned char stat;
         unsigned char fifo;
-        unsigned char bswapped;
-        unsigned char nt_mode;
-        unsigned char chip;
-        int b_fifo_size;
-        unsigned char last_fifo;
-        void *extra;
-        int nt_timer;
+        unsigned char bswapped;
+        unsigned char nt_mode;
+        unsigned char chip;
+        int b_fifo_size;
+        unsigned char last_fifo;
+        void *extra;
+        int nt_timer;
         struct timer_list timer;
 };
 
@@ -784,13 +784,13 @@ struct bkm_hw {
         /* Scitel Quadro stuff */
         unsigned long plx_adr;
         unsigned long data_adr;
-};      
+};
 
 struct gazel_hw {
         struct pci_dev *dev;
         unsigned int cfg_reg;
         unsigned int pciaddr[2];
-        signed   int ipac;
+        signed   int ipac;
         signed   int isac;
         signed   int hscx[2];
         signed   int isacfifo;
@@ -877,8 +877,8 @@ struct icc_chip {
 #define HW_ARCOFI               3
 #define FLG_TWO_DCHAN           4
 #define FLG_L1_DBUSY            5
-#define FLG_DBUSY_TIMER         6
-#define FLG_LOCK_ATOMIC         7
+#define FLG_DBUSY_TIMER         6
+#define FLG_LOCK_ATOMIC         7
 #define FLG_ARCOFI_TIMER        8
 #define FLG_ARCOFI_ERROR        9
 #define FLG_HW_L1_UINT          10
@@ -892,8 +892,8 @@ struct IsdnCardState {
         u_long          irq_flags;
         u_long          HW_Flags;
         int             *busy_flag;
-        int             chanlimit; /* limited number of B-chans to use */
-        int             logecho; /* log echo if supported by card */
+        int             chanlimit; /* limited number of B-chans to use */
+        int             logecho; /* log echo if supported by card */
         union {
                 struct elsa_hw elsa;
                 struct teles0_hw teles0;
@@ -937,8 +937,8 @@ struct IsdnCardState {
         void            (*DC_Close) (struct IsdnCardState *);
         irq_handler_t   irq_func;
         int             (*auxcmd) (struct IsdnCardState *, isdn_ctrl *);
-        struct Channel  channel[2+MAX_WAITING_CALLS];
-        struct BCState  bcs[2+MAX_WAITING_CALLS];
+        struct Channel  channel[2 + MAX_WAITING_CALLS];
+        struct BCState  bcs[2 + MAX_WAITING_CALLS];
         struct PStack   *stlist;
         struct sk_buff_head rq, sq; /* D-channel queues */
         int             cardnr;
@@ -969,7 +969,7 @@ struct IsdnCardState {
 };
 
 
-#define  schedule_event(s, ev)  do {test_and_set_bit(ev, &s->event);schedule_work(&s->tqueue); } while(0)
+#define schedule_event(s, ev)   do { test_and_set_bit(ev, &s->event); schedule_work(&s->tqueue); } while (0)
 
 #define  MON0_RX        1
 #define  MON1_RX        2
@@ -1053,7 +1053,7 @@ struct IsdnCardState {
 #define CARD_IX1MICROR2 0
 #endif
 
-#ifdef  CONFIG_HISAX_DIEHLDIVA
+#ifdef CONFIG_HISAX_DIEHLDIVA
 #define CARD_DIEHLDIVA 1
 #ifndef ISDN_CHIP_ISAC
 #define ISDN_CHIP_ISAC 1
@@ -1062,7 +1062,7 @@ struct IsdnCardState {
 #define CARD_DIEHLDIVA 0
 #endif
 
-#ifdef  CONFIG_HISAX_ASUSCOM
+#ifdef CONFIG_HISAX_ASUSCOM
 #define CARD_ASUSCOM 1
 #ifndef ISDN_CHIP_ISAC
 #define ISDN_CHIP_ISAC 1
@@ -1071,7 +1071,7 @@ struct IsdnCardState {
 #define CARD_ASUSCOM 0
 #endif
 
-#ifdef  CONFIG_HISAX_TELEINT
+#ifdef CONFIG_HISAX_TELEINT
 #define CARD_TELEINT 1
 #ifndef ISDN_CHIP_ISAC
 #define ISDN_CHIP_ISAC 1
@@ -1080,7 +1080,7 @@ struct IsdnCardState {
 #define CARD_TELEINT 0
 #endif
 
-#ifdef  CONFIG_HISAX_SEDLBAUER
+#ifdef CONFIG_HISAX_SEDLBAUER
 #define CARD_SEDLBAUER 1
 #ifndef ISDN_CHIP_ISAC
 #define ISDN_CHIP_ISAC 1
@@ -1089,7 +1089,7 @@ struct IsdnCardState {
 #define CARD_SEDLBAUER 0
 #endif
 
-#ifdef  CONFIG_HISAX_SPORTSTER
+#ifdef CONFIG_HISAX_SPORTSTER
 #define CARD_SPORTSTER 1
 #ifndef ISDN_CHIP_ISAC
 #define ISDN_CHIP_ISAC 1
@@ -1098,7 +1098,7 @@ struct IsdnCardState {
 #define CARD_SPORTSTER 0
 #endif
 
-#ifdef  CONFIG_HISAX_MIC
+#ifdef CONFIG_HISAX_MIC
 #define CARD_MIC 1
 #ifndef ISDN_CHIP_ISAC
 #define ISDN_CHIP_ISAC 1
@@ -1107,7 +1107,7 @@ struct IsdnCardState {
 #define CARD_MIC 0
 #endif
 
-#ifdef  CONFIG_HISAX_NETJET
+#ifdef CONFIG_HISAX_NETJET
 #define CARD_NETJET_S 1
 #ifndef ISDN_CHIP_ISAC
 #define ISDN_CHIP_ISAC 1
@@ -1206,7 +1206,7 @@ struct IsdnCardState {
 #define CARD_W6692      0
 #endif
 
-#ifdef  CONFIG_HISAX_NETJET_U
+#ifdef CONFIG_HISAX_NETJET_U
 #define CARD_NETJET_U 1
 #ifndef ISDN_CHIP_ICC
 #define ISDN_CHIP_ICC 1
@@ -1269,8 +1269,8 @@ void setstack_l3dc(struct PStack *st, struct Channel *chanp);
 void setstack_l3bc(struct PStack *st, struct Channel *chanp);
 void releasestack_isdnl3(struct PStack *st);
 
-u_char *findie(u_char * p, int size, u_char ie, int wanted_set);
-int getcallref(u_char * p);
+u_char *findie(u_char *p, int size, u_char ie, int wanted_set);
+int getcallref(u_char *p);
 int newcallref(void);
 
 int FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount);
@@ -1279,36 +1279,36 @@ int FsmEvent(struct FsmInst *fi, int event, void *arg);
 void FsmChangeState(struct FsmInst *fi, int newstate);
 void FsmInitTimer(struct FsmInst *fi, struct FsmTimer *ft);
 int FsmAddTimer(struct FsmTimer *ft, int millisec, int event,
-        void *arg, int where);
+                void *arg, int where);
 void FsmRestartTimer(struct FsmTimer *ft, int millisec, int event,
-        void *arg, int where);
+                     void *arg, int where);
 void FsmDelTimer(struct FsmTimer *ft, int where);
 int jiftime(char *s, long mark);
 
-int HiSax_command(isdn_ctrl * ic);
+int HiSax_command(isdn_ctrl *ic);
 int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb);
 __printf(3, 4)
 void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...);
 __printf(3, 0)
 void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args);
 void HiSax_reportcard(int cardnr, int sel);
-int QuickHex(char *txt, u_char * p, int cnt);
-void LogFrame(struct IsdnCardState *cs, u_char * p, int size);
+int QuickHex(char *txt, u_char *p, int cnt);
+void LogFrame(struct IsdnCardState *cs, u_char *p, int size);
 void dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir);
-void iecpy(u_char * dest, u_char * iestart, int ieoffset);
+void iecpy(u_char *dest, u_char *iestart, int ieoffset);
 #endif  /* __KERNEL__ */
 
 /*
  * Busywait delay for `jiffs' jiffies
  */
-#define HZDELAY(jiffs) do {                                     \
-                int tout = jiffs;                               \
-                                                                \
-                while (tout--) {                                \
-                        int loops = USEC_PER_SEC / HZ;          \
-                        while (loops--)                         \
-                                udelay(1);                      \
-                }                                               \
+#define HZDELAY(jiffs) do {                             \
+                int tout = jiffs;                       \
+                                                        \
+                while (tout--) {                        \
+                        int loops = USEC_PER_SEC / HZ;  \
+                        while (loops--)                 \
+                                udelay(1);              \
+                }                                       \
         } while (0)
 
 int ll_run(struct IsdnCardState *cs, int addfeatures);