diff options
author | Joey Pabalinas <joeypabalinas@gmail.com> | 2018-04-25 01:48:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-25 08:54:26 -0400 |
commit | c6964e93cac98c962f92bca5ae03272caf455df8 (patch) | |
tree | 47a81a8641c804a9ff8c2d3133c0aa0aabaa21e4 | |
parent | 2ea0452c5a222be7f581d8cd48058ee6472d1449 (diff) |
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>
-rw-r--r-- | drivers/tty/nozomi.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index 675c02c51598..fed820e9ab9d 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c | |||
@@ -102,41 +102,41 @@ do { \ | |||
102 | #define RECEIVE_BUF_MAX 4 | 102 | #define RECEIVE_BUF_MAX 4 |
103 | 103 | ||
104 | 104 | ||
105 | #define R_IIR 0x0000 /* Interrupt Identity Register */ | 105 | #define R_IIR 0x0000 /* Interrupt Identity Register */ |
106 | #define R_FCR 0x0000 /* Flow Control Register */ | 106 | #define R_FCR 0x0000 /* Flow Control Register */ |
107 | #define R_IER 0x0004 /* Interrupt Enable Register */ | 107 | #define R_IER 0x0004 /* Interrupt Enable Register */ |
108 | 108 | ||
109 | #define NOZOMI_CONFIG_MAGIC 0xEFEFFEFE | 109 | #define NOZOMI_CONFIG_MAGIC 0xEFEFFEFE |
110 | #define TOGGLE_VALID 0x0000 | 110 | #define TOGGLE_VALID 0x0000 |
111 | 111 | ||
112 | /* Definition of interrupt tokens */ | 112 | /* Definition of interrupt tokens */ |
113 | #define MDM_DL1 0x0001 | 113 | #define MDM_DL1 0x0001 |
114 | #define MDM_UL1 0x0002 | 114 | #define MDM_UL1 0x0002 |
115 | #define MDM_DL2 0x0004 | 115 | #define MDM_DL2 0x0004 |
116 | #define MDM_UL2 0x0008 | 116 | #define MDM_UL2 0x0008 |
117 | #define DIAG_DL1 0x0010 | 117 | #define DIAG_DL1 0x0010 |
118 | #define DIAG_DL2 0x0020 | 118 | #define DIAG_DL2 0x0020 |
119 | #define DIAG_UL 0x0040 | 119 | #define DIAG_UL 0x0040 |
120 | #define APP1_DL 0x0080 | 120 | #define APP1_DL 0x0080 |
121 | #define APP1_UL 0x0100 | 121 | #define APP1_UL 0x0100 |
122 | #define APP2_DL 0x0200 | 122 | #define APP2_DL 0x0200 |
123 | #define APP2_UL 0x0400 | 123 | #define APP2_UL 0x0400 |
124 | #define CTRL_DL 0x0800 | 124 | #define CTRL_DL 0x0800 |
125 | #define CTRL_UL 0x1000 | 125 | #define CTRL_UL 0x1000 |
126 | #define RESET 0x8000 | 126 | #define RESET 0x8000 |
127 | 127 | ||
128 | #define MDM_DL (MDM_DL1 | MDM_DL2) | 128 | #define MDM_DL (MDM_DL1 | MDM_DL2) |
129 | #define MDM_UL (MDM_UL1 | MDM_UL2) | 129 | #define MDM_UL (MDM_UL1 | MDM_UL2) |
130 | #define DIAG_DL (DIAG_DL1 | DIAG_DL2) | 130 | #define DIAG_DL (DIAG_DL1 | DIAG_DL2) |
131 | 131 | ||
132 | /* modem signal definition */ | 132 | /* modem signal definition */ |
133 | #define CTRL_DSR 0x0001 | 133 | #define CTRL_DSR 0x0001 |
134 | #define CTRL_DCD 0x0002 | 134 | #define CTRL_DCD 0x0002 |
135 | #define CTRL_RI 0x0004 | 135 | #define CTRL_RI 0x0004 |
136 | #define CTRL_CTS 0x0008 | 136 | #define CTRL_CTS 0x0008 |
137 | 137 | ||
138 | #define CTRL_DTR 0x0001 | 138 | #define CTRL_DTR 0x0001 |
139 | #define CTRL_RTS 0x0002 | 139 | #define CTRL_RTS 0x0002 |
140 | 140 | ||
141 | #define MAX_PORT 4 | 141 | #define MAX_PORT 4 |
142 | #define NOZOMI_MAX_PORTS 5 | 142 | #define NOZOMI_MAX_PORTS 5 |
@@ -365,7 +365,7 @@ struct buffer { | |||
365 | u8 *data; | 365 | u8 *data; |
366 | } __attribute__ ((packed)); | 366 | } __attribute__ ((packed)); |
367 | 367 | ||
368 | /* Global variables */ | 368 | /* Global variables */ |
369 | static const struct pci_device_id nozomi_pci_tbl[] = { | 369 | static const struct pci_device_id nozomi_pci_tbl[] = { |
370 | {PCI_DEVICE(0x1931, 0x000c)}, /* Nozomi HSDPA */ | 370 | {PCI_DEVICE(0x1931, 0x000c)}, /* Nozomi HSDPA */ |
371 | {}, | 371 | {}, |
@@ -1686,12 +1686,12 @@ static int ntty_tiocmget(struct tty_struct *tty) | |||
1686 | 1686 | ||
1687 | /* Note: these could change under us but it is not clear this | 1687 | /* Note: these could change under us but it is not clear this |
1688 | matters if so */ | 1688 | matters if so */ |
1689 | return (ctrl_ul->RTS ? TIOCM_RTS : 0) | | 1689 | return (ctrl_ul->RTS ? TIOCM_RTS : 0) |
1690 | (ctrl_ul->DTR ? TIOCM_DTR : 0) | | 1690 | | (ctrl_ul->DTR ? TIOCM_DTR : 0) |
1691 | (ctrl_dl->DCD ? TIOCM_CAR : 0) | | 1691 | | (ctrl_dl->DCD ? TIOCM_CAR : 0) |
1692 | (ctrl_dl->RI ? TIOCM_RNG : 0) | | 1692 | | (ctrl_dl->RI ? TIOCM_RNG : 0) |
1693 | (ctrl_dl->DSR ? TIOCM_DSR : 0) | | 1693 | | (ctrl_dl->DSR ? TIOCM_DSR : 0) |
1694 | (ctrl_dl->CTS ? TIOCM_CTS : 0); | 1694 | | (ctrl_dl->CTS ? TIOCM_CTS : 0); |
1695 | } | 1695 | } |
1696 | 1696 | ||
1697 | /* Sets io controls parameters */ | 1697 | /* Sets io controls parameters */ |
@@ -1722,10 +1722,10 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags, | |||
1722 | const struct async_icount cnow = port->tty_icount; | 1722 | const struct async_icount cnow = port->tty_icount; |
1723 | int ret; | 1723 | int ret; |
1724 | 1724 | ||
1725 | ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) || | 1725 | ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) |
1726 | ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) || | 1726 | || ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) |
1727 | ((flags & TIOCM_CD) && (cnow.dcd != cprev->dcd)) || | 1727 | || ((flags & TIOCM_CD) && (cnow.dcd != cprev->dcd)) |
1728 | ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts)); | 1728 | || ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts)); |
1729 | 1729 | ||
1730 | *cprev = cnow; | 1730 | *cprev = cnow; |
1731 | 1731 | ||