tty/nozomi: fix inconsistent indentation

Correct misaligned indentation and remove extraneous spaces.

Signed-off-by: Joey Pabalinas <joeypabalinas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index 675c02c51598642003527aaee23b843c5d6249ae..fed820e9ab9d76b92b38cb85031739257c012c27 100644 (file)
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -102,41 +102,41 @@ do {                                                      \
 #define RECEIVE_BUF_MAX                4
 
 
-#define R_IIR          0x0000  /* Interrupt Identity Register */
-#define R_FCR          0x0000  /* Flow Control Register */
-#define R_IER          0x0004  /* Interrupt Enable Register */
+#define R_IIR                  0x0000  /* Interrupt Identity Register */
+#define R_FCR                  0x0000  /* Flow Control Register */
+#define R_IER                  0x0004  /* Interrupt Enable Register */
 
 #define NOZOMI_CONFIG_MAGIC    0xEFEFFEFE
 #define TOGGLE_VALID           0x0000
 
 /* Definition of interrupt tokens */
-#define MDM_DL1                0x0001
-#define MDM_UL1                0x0002
-#define MDM_DL2                0x0004
-#define MDM_UL2                0x0008
-#define DIAG_DL1       0x0010
-#define DIAG_DL2       0x0020
-#define DIAG_UL                0x0040
-#define APP1_DL                0x0080
-#define APP1_UL                0x0100
-#define APP2_DL                0x0200
-#define APP2_UL                0x0400
-#define CTRL_DL                0x0800
-#define CTRL_UL                0x1000
-#define RESET          0x8000
-
-#define MDM_DL         (MDM_DL1  | MDM_DL2)
-#define MDM_UL         (MDM_UL1  | MDM_UL2)
-#define DIAG_DL                (DIAG_DL1 | DIAG_DL2)
+#define MDM_DL1                        0x0001
+#define MDM_UL1                        0x0002
+#define MDM_DL2                        0x0004
+#define MDM_UL2                        0x0008
+#define DIAG_DL1               0x0010
+#define DIAG_DL2               0x0020
+#define DIAG_UL                        0x0040
+#define APP1_DL                        0x0080
+#define APP1_UL                        0x0100
+#define APP2_DL                        0x0200
+#define APP2_UL                        0x0400
+#define CTRL_DL                        0x0800
+#define CTRL_UL                        0x1000
+#define RESET                  0x8000
+
+#define MDM_DL                 (MDM_DL1  | MDM_DL2)
+#define MDM_UL                 (MDM_UL1  | MDM_UL2)
+#define DIAG_DL                        (DIAG_DL1 | DIAG_DL2)
 
 /* modem signal definition */
-#define CTRL_DSR       0x0001
-#define CTRL_DCD       0x0002
-#define CTRL_RI                0x0004
-#define CTRL_CTS       0x0008
+#define CTRL_DSR               0x0001
+#define CTRL_DCD               0x0002
+#define CTRL_RI                        0x0004
+#define CTRL_CTS               0x0008
 
-#define CTRL_DTR       0x0001
-#define CTRL_RTS       0x0002
+#define CTRL_DTR               0x0001
+#define CTRL_RTS               0x0002
 
 #define MAX_PORT               4
 #define NOZOMI_MAX_PORTS       5
@@ -365,7 +365,7 @@ struct buffer {
        u8 *data;
 } __attribute__ ((packed));
 
-/*    Global variables */
+/* Global variables */
 static const struct pci_device_id nozomi_pci_tbl[] = {
        {PCI_DEVICE(0x1931, 0x000c)},   /* Nozomi HSDPA */
        {},
@@ -1686,12 +1686,12 @@ static int ntty_tiocmget(struct tty_struct *tty)
 
        /* Note: these could change under us but it is not clear this
           matters if so */
-       return  (ctrl_ul->RTS ? TIOCM_RTS : 0) |
-               (ctrl_ul->DTR ? TIOCM_DTR : 0) |
-               (ctrl_dl->DCD ? TIOCM_CAR : 0) |
-               (ctrl_dl->RI  ? TIOCM_RNG : 0) |
-               (ctrl_dl->DSR ? TIOCM_DSR : 0) |
-               (ctrl_dl->CTS ? TIOCM_CTS : 0);
+       return (ctrl_ul->RTS ? TIOCM_RTS : 0)
+               | (ctrl_ul->DTR ? TIOCM_DTR : 0)
+               | (ctrl_dl->DCD ? TIOCM_CAR : 0)
+               | (ctrl_dl->RI  ? TIOCM_RNG : 0)
+               | (ctrl_dl->DSR ? TIOCM_DSR : 0)
+               | (ctrl_dl->CTS ? TIOCM_CTS : 0);
 }
 
 /* Sets io controls parameters */
@@ -1722,10 +1722,10 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags,
        const struct async_icount cnow = port->tty_icount;
        int ret;
 
-       ret =   ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||
-               ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) ||
-               ((flags & TIOCM_CD)  && (cnow.dcd != cprev->dcd)) ||
-               ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts));
+       ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng))
+               || ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr))
+               || ((flags & TIOCM_CD)  && (cnow.dcd != cprev->dcd))
+               || ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts));
 
        *cprev = cnow;