Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / isdn / gigaset / gigaset.h

diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 1dc25131e67033b4c9e1fc8041d58ff0a4e5a65b..8e2fc8f31d16455885177deb2c55b9a9b56c32a9 100644 (file)
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -163,8 +163,8 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define BAS_LOWFRAME   5       /* "    "    with negative flow control */
 #define BAS_CORRFRAMES 4       /* flow control multiplicator */
 
-#define BAS_INBUFSIZE  (BAS_MAXFRAME * BAS_NUMFRAMES)
-/* size of isoc in buf per URB */
+#define BAS_INBUFSIZE  (BAS_MAXFRAME * BAS_NUMFRAMES)  /* 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 */
 
@@ -471,18 +471,18 @@ struct cardstate {
                                           for */
        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) */
-       struct tasklet_struct write_tasklet;
-       /* tasklet for serial output
-        * (not used in base driver) */
+       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) */
+       struct tasklet_struct
+               write_tasklet;          /* tasklet for serial output
+                                        * (not used in base driver) */
 
        /* event queue */
        struct event_t events[MAX_EVENTS];
@@ -583,7 +583,7 @@ struct gigaset_ops {
        int (*initbcshw)(struct bc_state *bcs);
 
        /* Called by gigaset_freecs() for freeing bcs->hw.xxx */
-       int (*freebcshw)(struct bc_state *bcs);
+       void (*freebcshw)(struct bc_state *bcs);
 
        /* Called by gigaset_bchannel_down() for resetting bcs->hw.xxx */
        void (*reinitbcshw)(struct bc_state *bcs);