Skip to content

L
linux
Commit f86936ff authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller
Browse files
Options

isdn/gigaset: fix readability damage 

Fix up some of the readibility deterioration caused by the recent
whitespace coding style cleanup.
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e055d03d
Show whitespace changes
Inline Side-by-side
Showing with 208 additions and 216 deletions
drivers/isdn/gigaset/bas-gigaset.c
View file @ f86936ff
...@@ -877,8 +877,7 @@ static void read_iso_callback(struct urb *urb) ...@@ -877,8 +877,7 @@ static void read_iso_callback(struct urb *urb)
for (i = 0; i < BAS_NUMFRAMES; i++) { for (i = 0; i < BAS_NUMFRAMES; i++) {
ubc->isoinlost += urb->iso_frame_desc[i].actual_length; ubc->isoinlost += urb->iso_frame_desc[i].actual_length;
if (unlikely(urb->iso_frame_desc[i].status != 0 && if (unlikely(urb->iso_frame_desc[i].status != 0 &&
urb->iso_frame_desc[i].status != urb->iso_frame_desc[i].status != -EINPROGRESS))
-EINPROGRESS))
ubc->loststatus = urb->iso_frame_desc[i].status; ubc->loststatus = urb->iso_frame_desc[i].status;
urb->iso_frame_desc[i].status = 0; urb->iso_frame_desc[i].status = 0;
urb->iso_frame_desc[i].actual_length = 0; urb->iso_frame_desc[i].actual_length = 0;
......
drivers/isdn/gigaset/capi.c
View file @ f86936ff
...@@ -109,51 +109,35 @@ static struct { ...@@ -109,51 +109,35 @@ static struct {
u8 *bc; u8 *bc;
u8 *hlc; u8 *hlc;
} cip2bchlc[] = { } cip2bchlc[] = {
[1] = { "8090A3", NULL }, [1] = { "8090A3", NULL }, /* Speech (A-law) */
/* Speech (A-law) */ [2] = { "8890", NULL }, /* Unrestricted digital information */
[2] = { "8890", NULL }, [3] = { "8990", NULL }, /* Restricted digital information */
/* Unrestricted digital information */ [4] = { "9090A3", NULL }, /* 3,1 kHz audio (A-law) */
[3] = { "8990", NULL }, [5] = { "9190", NULL }, /* 7 kHz audio */
/* Restricted digital information */ [6] = { "9890", NULL }, /* Video */
[4] = { "9090A3", NULL }, [7] = { "88C0C6E6", NULL }, /* Packet mode */
/* 3,1 kHz audio (A-law) */ [8] = { "8890218F", NULL }, /* 56 kbit/s rate adaptation */
[5] = { "9190", NULL }, [9] = { "9190A5", NULL }, /* Unrestricted digital information
/* 7 kHz audio */ * with tones/announcements */
[6] = { "9890", NULL }, [16] = { "8090A3", "9181" }, /* Telephony */
/* Video */ [17] = { "9090A3", "9184" }, /* Group 2/3 facsimile */
[7] = { "88C0C6E6", NULL }, [18] = { "8890", "91A1" }, /* Group 4 facsimile Class 1 */
/* Packet mode */ [19] = { "8890", "91A4" }, /* Teletex service basic and mixed mode
[8] = { "8890218F", NULL }, * and Group 4 facsimile service
/* 56 kbit/s rate adaptation */ * Classes II and III */
[9] = { "9190A5", NULL }, [20] = { "8890", "91A8" }, /* Teletex service basic and
/* Unrestricted digital information with tones/announcements */ * processable mode */
[16] = { "8090A3", "9181" }, [21] = { "8890", "91B1" }, /* Teletex service basic mode */
/* Telephony */ [22] = { "8890", "91B2" }, /* International interworking for
[17] = { "9090A3", "9184" }, * Videotex */
/* Group 2/3 facsimile */ [23] = { "8890", "91B5" }, /* Telex */
[18] = { "8890", "91A1" }, [24] = { "8890", "91B8" }, /* Message Handling Systems
/* Group 4 facsimile Class 1 */ * in accordance with X.400 */
[19] = { "8890", "91A4" }, [25] = { "8890", "91C1" }, /* OSI application
/* Teletex service basic and mixed mode * in accordance with X.200 */
and Group 4 facsimile service Classes II and III */ [26] = { "9190A5", "9181" }, /* 7 kHz telephony */
[20] = { "8890", "91A8" }, [27] = { "9190A5", "916001" }, /* Video telephony, first connection */
/* Teletex service basic and processable mode */ [28] = { "8890", "916002" }, /* Video telephony, second connection */
[21] = { "8890", "91B1" },
/* Teletex service basic mode */
[22] = { "8890", "91B2" },
/* International interworking for Videotex */
[23] = { "8890", "91B5" },
/* Telex */
[24] = { "8890", "91B8" },
/* Message Handling Systems in accordance with X.400 */
[25] = { "8890", "91C1" },
/* OSI application in accordance with X.200 */
[26] = { "9190A5", "9181" },
/* 7 kHz telephony */
[27] = { "9190A5", "916001" },
/* Video telephony, first connection */
[28] = { "8890", "916002" },
/* Video telephony, second connection */
}; };
/* /*
...@@ -1197,7 +1181,9 @@ static void do_facility_req(struct gigaset_capi_ctr *iif, ...@@ -1197,7 +1181,9 @@ static void do_facility_req(struct gigaset_capi_ctr *iif,
confparam[3] = 2; /* length */ confparam[3] = 2; /* length */
capimsg_setu16(confparam, 4, CapiSuccess); capimsg_setu16(confparam, 4, CapiSuccess);
break; break;
/* ToDo: add supported services */ /* ToDo: add supported services */
default: default:
dev_notice(cs->dev, dev_notice(cs->dev,
"%s: unsupported supplementary service function 0x%04x\n", "%s: unsupported supplementary service function 0x%04x\n",
...@@ -1771,7 +1757,8 @@ static void do_connect_b3_req(struct gigaset_capi_ctr *iif, ...@@ -1771,7 +1757,8 @@ static void do_connect_b3_req(struct gigaset_capi_ctr *iif,
/* NCPI parameter: not applicable for B3 Transparent */ /* NCPI parameter: not applicable for B3 Transparent */
ignore_cstruct_param(cs, cmsg->NCPI, "CONNECT_B3_REQ", "NCPI"); ignore_cstruct_param(cs, cmsg->NCPI, "CONNECT_B3_REQ", "NCPI");
send_conf(iif, ap, skb, (cmsg->NCPI && cmsg->NCPI[0]) ? send_conf(iif, ap, skb,
(cmsg->NCPI && cmsg->NCPI[0]) ?
CapiNcpiNotSupportedByProtocol : CapiSuccess); CapiNcpiNotSupportedByProtocol : CapiSuccess);
} }
...@@ -1975,7 +1962,8 @@ static void do_disconnect_b3_req(struct gigaset_capi_ctr *iif, ...@@ -1975,7 +1962,8 @@ static void do_disconnect_b3_req(struct gigaset_capi_ctr *iif,
/* NCPI parameter: not applicable for B3 Transparent */ /* NCPI parameter: not applicable for B3 Transparent */
ignore_cstruct_param(cs, cmsg->NCPI, ignore_cstruct_param(cs, cmsg->NCPI,
"DISCONNECT_B3_REQ", "NCPI"); "DISCONNECT_B3_REQ", "NCPI");
send_conf(iif, ap, skb, (cmsg->NCPI && cmsg->NCPI[0]) ? send_conf(iif, ap, skb,
(cmsg->NCPI && cmsg->NCPI[0]) ?
CapiNcpiNotSupportedByProtocol : CapiSuccess); CapiNcpiNotSupportedByProtocol : CapiSuccess);
} }
......
drivers/isdn/gigaset/ev-layer.c
View file @ f86936ff
...@@ -649,9 +649,9 @@ static void disconnect(struct at_state_t **at_state_p) ...@@ -649,9 +649,9 @@ static void disconnect(struct at_state_t **at_state_p)
static inline struct at_state_t *get_free_channel(struct cardstate *cs, static inline struct at_state_t *get_free_channel(struct cardstate *cs,
int cid) int cid)
/* cids: >0: siemens-cid /* cids: >0: siemens-cid
0: without cid * 0: without cid
-1: no cid assigned yet * -1: no cid assigned yet
*/ */
{ {
unsigned long flags; unsigned long flags;
int i; int i;
...@@ -1375,6 +1375,7 @@ static void do_action(int action, struct cardstate *cs, ...@@ -1375,6 +1375,7 @@ static void do_action(int action, struct cardstate *cs,
break; break;
/* events from the LL */ /* events from the LL */
case ACT_DIAL: case ACT_DIAL:
start_dial(at_state, ev->ptr, ev->parameter); start_dial(at_state, ev->ptr, ev->parameter);
break; break;
...@@ -1388,6 +1389,7 @@ static void do_action(int action, struct cardstate *cs, ...@@ -1388,6 +1389,7 @@ static void do_action(int action, struct cardstate *cs,
break; break;
/* hotplug events */ /* hotplug events */
case ACT_STOP: case ACT_STOP:
do_stop(cs); do_stop(cs);
break; break;
...@@ -1396,6 +1398,7 @@ static void do_action(int action, struct cardstate *cs, ...@@ -1396,6 +1398,7 @@ static void do_action(int action, struct cardstate *cs,
break; break;
/* events from the interface */ /* events from the interface */
case ACT_IF_LOCK: case ACT_IF_LOCK:
cs->cmd_result = ev->parameter ? do_lock(cs) : do_unlock(cs); cs->cmd_result = ev->parameter ? do_lock(cs) : do_unlock(cs);
cs->waiting = 0; cs->waiting = 0;
...@@ -1415,6 +1418,7 @@ static void do_action(int action, struct cardstate *cs, ...@@ -1415,6 +1418,7 @@ static void do_action(int action, struct cardstate *cs,
break; break;
/* events from the proc file system */ /* events from the proc file system */
case ACT_PROC_CIDMODE: case ACT_PROC_CIDMODE:
spin_lock_irqsave(&cs->lock, flags); spin_lock_irqsave(&cs->lock, flags);
if (ev->parameter != cs->cidmode) { if (ev->parameter != cs->cidmode) {
...@@ -1434,6 +1438,7 @@ static void do_action(int action, struct cardstate *cs, ...@@ -1434,6 +1438,7 @@ static void do_action(int action, struct cardstate *cs,
break; break;
/* events from the hardware drivers */ /* events from the hardware drivers */
case ACT_NOTIFY_BC_DOWN: case ACT_NOTIFY_BC_DOWN:
bchannel_down(bcs); bchannel_down(bcs);
break; break;
......
drivers/isdn/gigaset/gigaset.h
View file @ f86936ff
...@@ -163,8 +163,8 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg, ...@@ -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_LOWFRAME 5 /* " " with negative flow control */
#define BAS_CORRFRAMES 4 /* flow control multiplicator */ #define BAS_CORRFRAMES 4 /* flow control multiplicator */
#define BAS_INBUFSIZE (BAS_MAXFRAME * BAS_NUMFRAMES) #define BAS_INBUFSIZE (BAS_MAXFRAME * BAS_NUMFRAMES) /* size of isoc in buf
/* size of isoc in buf per URB */ * per URB */
#define BAS_OUTBUFSIZE 4096 /* size of common isoc out buffer */ #define BAS_OUTBUFSIZE 4096 /* size of common isoc out buffer */
#define BAS_OUTBUFPAD BAS_MAXFRAME /* size of pad area for isoc out buf */ #define BAS_OUTBUFPAD BAS_MAXFRAME /* size of pad area for isoc out buf */
...@@ -471,8 +471,8 @@ struct cardstate { ...@@ -471,8 +471,8 @@ struct cardstate {
for */ for */
int commands_pending; /* flag(s) in xxx.commands_pending have int commands_pending; /* flag(s) in xxx.commands_pending have
been set */ been set */
struct tasklet_struct event_tasklet; struct tasklet_struct
/* tasklet for serializing AT commands. event_tasklet; /* tasklet for serializing AT commands.
* Scheduled * Scheduled
* -> for modem reponses (and * -> for modem reponses (and
* incoming data for M10x) * incoming data for M10x)
...@@ -480,8 +480,8 @@ struct cardstate { ...@@ -480,8 +480,8 @@ struct cardstate {
* -> after setting bits in * -> after setting bits in
* xxx.at_state.pending_command * xxx.at_state.pending_command
* (e.g. command from LL) */ * (e.g. command from LL) */
struct tasklet_struct write_tasklet; struct tasklet_struct
/* tasklet for serial output write_tasklet; /* tasklet for serial output
* (not used in base driver) */ * (not used in base driver) */
/* event queue */ /* event queue */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7