Commit f3c909b4 authored by Aldo Iljazi's avatar Aldo Iljazi Committed by Greg Kroah-Hartman

Drivers: tty: n_gsm.c: fixed 7 errors & 6 warnings that checkpatch complained

Specifically:
n_gsm.c:810: ERROR: space required before the open parenthesis '('
n_gsm.c:830: WARNING: line over 80 characters
n_gsm.c:971: ERROR: trailing whitespace
n_gsm.c:984: ERROR: code indent should use tabs where possible
n_gsm.c:984: WARNING: please, no space before tabs
n_gsm.c:984: WARNING: please, no spaces at the start of a line
n_gsm.c:1141: WARNING: space prohibited before semicolon
n_gsm.c:1743: ERROR: space required before the open brace '{'
n_gsm.c:1744: WARNING: line over 80 characters
n_gsm.c:1745: ERROR: code indent should use tabs where possible
n_gsm.c:1746: ERROR: code indent should use tabs where possible
n_gsm.c:2908: WARNING: line over 80 characters
n_gsm.c:2912: ERROR: trailing whitespace
Signed-off-by: default avatarAldo Iljazi <neonsync1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dee4a0be
...@@ -807,7 +807,7 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci) ...@@ -807,7 +807,7 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci)
int h = dlci->adaption - 1; int h = dlci->adaption - 1;
total_size = 0; total_size = 0;
while(1) { while (1) {
len = kfifo_len(dlci->fifo); len = kfifo_len(dlci->fifo);
if (len == 0) if (len == 0)
return total_size; return total_size;
...@@ -827,8 +827,8 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci) ...@@ -827,8 +827,8 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci)
switch (dlci->adaption) { switch (dlci->adaption) {
case 1: /* Unstructured */ case 1: /* Unstructured */
break; break;
case 2: /* Unstructed with modem bits. Always one byte as we never case 2: /* Unstructed with modem bits.
send inline break data */ Always one byte as we never send inline break data */
*dp++ = gsm_encode_modem(dlci); *dp++ = gsm_encode_modem(dlci);
break; break;
} }
...@@ -968,7 +968,7 @@ static void gsm_dlci_data_kick(struct gsm_dlci *dlci) ...@@ -968,7 +968,7 @@ static void gsm_dlci_data_kick(struct gsm_dlci *dlci)
unsigned long flags; unsigned long flags;
int sweep; int sweep;
if (dlci->constipated) if (dlci->constipated)
return; return;
spin_lock_irqsave(&dlci->gsm->tx_lock, flags); spin_lock_irqsave(&dlci->gsm->tx_lock, flags);
...@@ -981,7 +981,7 @@ static void gsm_dlci_data_kick(struct gsm_dlci *dlci) ...@@ -981,7 +981,7 @@ static void gsm_dlci_data_kick(struct gsm_dlci *dlci)
gsm_dlci_data_output(dlci->gsm, dlci); gsm_dlci_data_output(dlci->gsm, dlci);
} }
if (sweep) if (sweep)
gsm_dlci_data_sweep(dlci->gsm); gsm_dlci_data_sweep(dlci->gsm);
spin_unlock_irqrestore(&dlci->gsm->tx_lock, flags); spin_unlock_irqrestore(&dlci->gsm->tx_lock, flags);
} }
...@@ -1138,7 +1138,7 @@ static void gsm_control_modem(struct gsm_mux *gsm, u8 *data, int clen) ...@@ -1138,7 +1138,7 @@ static void gsm_control_modem(struct gsm_mux *gsm, u8 *data, int clen)
static void gsm_control_rls(struct gsm_mux *gsm, u8 *data, int clen) static void gsm_control_rls(struct gsm_mux *gsm, u8 *data, int clen)
{ {
struct tty_port *port; struct tty_port *port;
unsigned int addr = 0 ; unsigned int addr = 0;
u8 bits; u8 bits;
int len = clen; int len = clen;
u8 *dp = data; u8 *dp = data;
...@@ -1740,10 +1740,11 @@ static void gsm_queue(struct gsm_mux *gsm) ...@@ -1740,10 +1740,11 @@ static void gsm_queue(struct gsm_mux *gsm)
if ((gsm->control & ~PF) == UI) if ((gsm->control & ~PF) == UI)
gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf, gsm->len); gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf, gsm->len);
if (gsm->encoding == 0){ if (gsm->encoding == 0) {
/* WARNING: gsm->received_fcs is used for gsm->encoding = 0 only. /* WARNING: gsm->received_fcs is used for
In this case it contain the last piece of data gsm->encoding = 0 only.
required to generate final CRC */ In this case it contain the last piece of data
required to generate final CRC */
gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs); gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
} }
if (gsm->fcs != GOOD_FCS) { if (gsm->fcs != GOOD_FCS) {
...@@ -2904,9 +2905,11 @@ static int gsmtty_install(struct tty_driver *driver, struct tty_struct *tty) ...@@ -2904,9 +2905,11 @@ static int gsmtty_install(struct tty_driver *driver, struct tty_struct *tty)
gsm = gsm_mux[mux]; gsm = gsm_mux[mux];
if (gsm->dead) if (gsm->dead)
return -EL2HLT; return -EL2HLT;
/* If DLCI 0 is not yet fully open return an error. This is ok from a locking /* If DLCI 0 is not yet fully open return an error.
perspective as we don't have to worry about this if DLCI0 is lost */ This is ok from a locking
if (gsm->dlci[0] && gsm->dlci[0]->state != DLCI_OPEN) perspective as we don't have to worry about this
if DLCI0 is lost */
if (gsm->dlci[0] && gsm->dlci[0]->state != DLCI_OPEN)
return -EL2NSYNC; return -EL2NSYNC;
dlci = gsm->dlci[line]; dlci = gsm->dlci[line];
if (dlci == NULL) { if (dlci == NULL) {
......
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