Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[linux-2.6.git] / drivers / isdn / gigaset / gigaset.h
index f877726..1dc2513 100644 (file)
@@ -91,11 +91,11 @@ enum debuglevel {
 
 #ifdef CONFIG_GIGASET_DEBUG
 
-#define gig_dbg(level, format, arg...) \
-       do { \
+#define gig_dbg(level, format, arg...)                                 \
+       do {                                                            \
                if (unlikely(((enum debuglevel)gigaset_debuglevel) & (level))) \
                        printk(KERN_DEBUG KBUILD_MODNAME ": " format "\n", \
-                              ## arg); \
+                              ## arg);                                 \
        } while (0)
 #define DEBUG_DEFAULT (DEBUG_TRANSCMD | DEBUG_CMD | DEBUG_USBREQ)
 
@@ -164,7 +164,7 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define BAS_CORRFRAMES 4       /* flow control multiplicator */
 
 #define BAS_INBUFSIZE  (BAS_MAXFRAME * BAS_NUMFRAMES)
-                                       /* size of isoc in buf per URB */
+/* size of isoc in buf per URB */
 #define BAS_OUTBUFSIZE 4096            /* size of common isoc out buffer */
 #define BAS_OUTBUFPAD  BAS_MAXFRAME    /* size of pad area for isoc out buf */
 
@@ -472,17 +472,17 @@ struct cardstate {
        int commands_pending;           /* flag(s) in xxx.commands_pending have
                                           been set */
        struct tasklet_struct event_tasklet;
-                                       /* tasklet for serializing AT commands.
-                                        * Scheduled
-                                        *   -> for modem reponses (and
-                                        *      incoming data for M10x)
-                                        *   -> on timeout
-                                        *   -> after setting bits in
-                                        *      xxx.at_state.pending_command
-                                        *      (e.g. command from LL) */
+       /* tasklet for serializing AT commands.
+        * Scheduled
+        *   -> for modem reponses (and
+        *      incoming data for M10x)
+        *   -> on timeout
+        *   -> after setting bits in
+        *      xxx.at_state.pending_command
+        *      (e.g. command from LL) */
        struct tasklet_struct write_tasklet;
-                                       /* tasklet for serial output
-                                        * (not used in base driver) */
+       /* tasklet for serial output
+        * (not used in base driver) */
 
        /* event queue */
        struct event_t events[MAX_EVENTS];
@@ -490,7 +490,7 @@ struct cardstate {
        spinlock_t ev_lock;
 
        /* current modem response */
-       unsigned char respdata[MAX_RESP_SIZE+1];
+       unsigned char respdata[MAX_RESP_SIZE + 1];
        unsigned cbytes;
 
        /* private data of hardware drivers */