staging: dgnc: remove blankline after brace
Blank lines are not needed after opening braces. checkpatch was giving us warnings about this. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee
Greg Kroah-Hartman
Родитель
40215ddffc
Коммит
205fc1fc95
|
|
@ -378,7 +378,6 @@ static inline void cls_parse_isr(struct dgnc_board *brd, uint port)
|
|||
|
||||
/* Here we try to figure out what caused the interrupt to happen */
|
||||
while (1) {
|
||||
|
||||
isr = readb(&ch->ch_cls_uart->isr_fcr);
|
||||
|
||||
/* Bail if no pending interrupt on port */
|
||||
|
|
@ -472,7 +471,6 @@ static void cls_param(struct tty_struct *tty)
|
|||
ch->ch_old_baud = 0;
|
||||
return;
|
||||
} else if (ch->ch_custom_speed) {
|
||||
|
||||
baud = ch->ch_custom_speed;
|
||||
/* Handle transition from B0 */
|
||||
if (ch->ch_flags & CH_BAUD0) {
|
||||
|
|
@ -704,7 +702,6 @@ static void cls_tasklet(unsigned long data)
|
|||
* If board is ready, parse deeper to see if there is anything to do.
|
||||
*/
|
||||
if ((state == BOARD_READY) && (ports > 0)) {
|
||||
|
||||
/* Loop on each port */
|
||||
for (i = 0; i < ports; i++) {
|
||||
ch = bd->channels[i];
|
||||
|
|
@ -999,7 +996,6 @@ static void cls_copy_data_from_queue_to_uart(struct channel_t *ch)
|
|||
n = min(n, qlen);
|
||||
|
||||
while (n > 0) {
|
||||
|
||||
/*
|
||||
* If RTS Toggle mode is on, turn on RTS now if not already set,
|
||||
* and make sure we get an event when the data transfer has
|
||||
|
|
|
|||
|
|
@ -417,7 +417,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
|
|||
brd->irq = pci_irq;
|
||||
|
||||
switch (brd->device) {
|
||||
|
||||
case PCI_DEVICE_CLASSIC_4_DID:
|
||||
case PCI_DEVICE_CLASSIC_8_DID:
|
||||
case PCI_DEVICE_CLASSIC_4_422_DID:
|
||||
|
|
@ -516,7 +515,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
|
|||
dgnc_do_remap(brd);
|
||||
|
||||
if (brd->re_map_membase) {
|
||||
|
||||
/* Read and store the dvid after remapping */
|
||||
brd->dvid = readb(brd->re_map_membase + 0x8D);
|
||||
|
||||
|
|
@ -609,7 +607,6 @@ static int dgnc_finalize_board_init(struct dgnc_board *brd)
|
|||
*/
|
||||
static void dgnc_do_remap(struct dgnc_board *brd)
|
||||
{
|
||||
|
||||
if (!brd || brd->magic != DGNC_BOARD_MAGIC)
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|||
void __user *uarg = (void __user *) arg;
|
||||
|
||||
switch (cmd) {
|
||||
|
||||
case DIGI_GETDD:
|
||||
{
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -320,7 +320,6 @@ static inline void neo_set_no_output_flow_control(struct channel_t *ch)
|
|||
/* change UARTs start/stop chars */
|
||||
static inline void neo_set_new_start_stop_chars(struct channel_t *ch)
|
||||
{
|
||||
|
||||
/* if hardware flow control is set, then skip this whole thing */
|
||||
if (ch->ch_digi.digi_flags & (CTSPACE | RTSPACE) || ch->ch_c_cflag & CRTSCTS)
|
||||
return;
|
||||
|
|
@ -387,7 +386,6 @@ static inline void neo_parse_isr(struct dgnc_board *brd, uint port)
|
|||
|
||||
/* Here we try to figure out what caused the interrupt to happen */
|
||||
while (1) {
|
||||
|
||||
isr = readb(&ch->ch_neo_uart->isr_fcr);
|
||||
|
||||
/* Bail if no pending interrupt */
|
||||
|
|
@ -626,7 +624,6 @@ static void neo_param(struct tty_struct *tty)
|
|||
return;
|
||||
|
||||
} else if (ch->ch_custom_speed) {
|
||||
|
||||
baud = ch->ch_custom_speed;
|
||||
/* Handle transition from B0 */
|
||||
if (ch->ch_flags & CH_BAUD0) {
|
||||
|
|
@ -954,7 +951,6 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
|
|||
|
||||
/* Loop on each port */
|
||||
while ((uart_poll & 0xff) != 0) {
|
||||
|
||||
tmp = uart_poll;
|
||||
|
||||
/* Check current port to see if it has interrupt pending */
|
||||
|
|
@ -977,7 +973,6 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
|
|||
|
||||
/* Switch on type of interrupt we have */
|
||||
switch (type) {
|
||||
|
||||
case UART_17158_RXRDY_TIMEOUT:
|
||||
/*
|
||||
* RXRDY Time-out is cleared by reading data in the
|
||||
|
|
@ -1141,7 +1136,6 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)
|
|||
total = min(total, qleft);
|
||||
|
||||
while (total > 0) {
|
||||
|
||||
/*
|
||||
* Grab the linestatus register, we need to check
|
||||
* to see if there are any errors in the FIFO.
|
||||
|
|
@ -1206,7 +1200,6 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)
|
|||
* Also deal with any possible queue overflow here as well.
|
||||
*/
|
||||
while (1) {
|
||||
|
||||
/*
|
||||
* Its possible we have a linestatus from the loop above
|
||||
* this, so we "OR" on any extra bits.
|
||||
|
|
@ -1339,7 +1332,6 @@ static void neo_flush_uart_write(struct channel_t *ch)
|
|||
neo_pci_posting_flush(ch->ch_bd);
|
||||
|
||||
for (i = 0; i < 10; i++) {
|
||||
|
||||
/* Check to see if the UART feels it completely flushed the FIFO. */
|
||||
tmp = readb(&ch->ch_neo_uart->isr_fcr);
|
||||
if (tmp & 4)
|
||||
|
|
@ -1368,7 +1360,6 @@ static void neo_flush_uart_read(struct channel_t *ch)
|
|||
neo_pci_posting_flush(ch->ch_bd);
|
||||
|
||||
for (i = 0; i < 10; i++) {
|
||||
|
||||
/* Check to see if the UART feels it completely flushed the FIFO. */
|
||||
tmp = readb(&ch->ch_neo_uart->isr_fcr);
|
||||
if (tmp & 2)
|
||||
|
|
@ -1473,7 +1464,6 @@ static void neo_copy_data_from_queue_to_uart(struct channel_t *ch)
|
|||
n = min(n, qlen);
|
||||
|
||||
while (n > 0) {
|
||||
|
||||
s = ((head >= tail) ? head : WQUEUESIZE) - tail;
|
||||
s = min(s, n);
|
||||
|
||||
|
|
@ -1632,7 +1622,6 @@ static void neo_send_stop_character(struct channel_t *ch)
|
|||
*/
|
||||
static void neo_uart_init(struct channel_t *ch)
|
||||
{
|
||||
|
||||
writeb(0, &ch->ch_neo_uart->ier);
|
||||
writeb(0, &ch->ch_neo_uart->efr);
|
||||
writeb(UART_EFR_ECB, &ch->ch_neo_uart->efr);
|
||||
|
|
|
|||
|
|
@ -543,7 +543,6 @@ void dgnc_input(struct channel_t *ch)
|
|||
!(ch->ch_tun.un_flags & UN_ISOPEN) ||
|
||||
!(tp->termios.c_cflag & CREAD) ||
|
||||
(ch->ch_tun.un_flags & UN_CLOSING)) {
|
||||
|
||||
ch->ch_r_head = tail;
|
||||
|
||||
/* Force queue flow control to be released, if needed */
|
||||
|
|
@ -706,7 +705,6 @@ void dgnc_carrier(struct channel_t *ch)
|
|||
* Test for a VIRTUAL carrier transition to HIGH.
|
||||
*/
|
||||
if (((ch->ch_flags & CH_FCAR) == 0) && (virt_carrier == 1)) {
|
||||
|
||||
/*
|
||||
* When carrier rises, wake any threads waiting
|
||||
* for carrier in the open routine.
|
||||
|
|
@ -720,7 +718,6 @@ void dgnc_carrier(struct channel_t *ch)
|
|||
* Test for a PHYSICAL carrier transition to HIGH.
|
||||
*/
|
||||
if (((ch->ch_flags & CH_CD) == 0) && (phys_carrier == 1)) {
|
||||
|
||||
/*
|
||||
* When carrier rises, wake any threads waiting
|
||||
* for carrier in the open routine.
|
||||
|
|
@ -741,7 +738,6 @@ void dgnc_carrier(struct channel_t *ch)
|
|||
*/
|
||||
if ((virt_carrier == 0) && ((ch->ch_flags & CH_CD) != 0) &&
|
||||
(phys_carrier == 0)) {
|
||||
|
||||
/*
|
||||
* When carrier drops:
|
||||
*
|
||||
|
|
@ -1148,7 +1144,6 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
|
|||
* Initialize if neither terminal or printer is open.
|
||||
*/
|
||||
if (!((ch->ch_tun.un_flags | ch->ch_pun.un_flags) & UN_ISOPEN)) {
|
||||
|
||||
/*
|
||||
* Flush input queues.
|
||||
*/
|
||||
|
|
@ -1241,7 +1236,6 @@ static int dgnc_block_til_ready(struct tty_struct *tty,
|
|||
|
||||
/* Loop forever */
|
||||
while (1) {
|
||||
|
||||
sleep_on_un_flags = 0;
|
||||
|
||||
/*
|
||||
|
|
@ -1269,7 +1263,6 @@ static int dgnc_block_til_ready(struct tty_struct *tty,
|
|||
if (!((ch->ch_tun.un_flags |
|
||||
ch->ch_pun.un_flags) &
|
||||
UN_CLOSING)) {
|
||||
|
||||
/*
|
||||
* Our conditions to leave cleanly and happily:
|
||||
* 1) NONBLOCKING on the tty is set.
|
||||
|
|
@ -1440,7 +1433,6 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
|
|||
*/
|
||||
if ((ch->ch_open_count == 0) &&
|
||||
!(ch->ch_digi.digi_flags & DIGI_PRINTER)) {
|
||||
|
||||
ch->ch_flags &= ~(CH_STOPI | CH_FORCED_STOPI);
|
||||
|
||||
/*
|
||||
|
|
@ -1469,7 +1461,6 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
|
|||
* If we have HUPCL set, lower DTR and RTS
|
||||
*/
|
||||
if (ch->ch_c_cflag & HUPCL) {
|
||||
|
||||
/* Drop RTS/DTR */
|
||||
ch->ch_mostat &= ~(UART_MCR_DTR | UART_MCR_RTS);
|
||||
bd->bd_ops->assert_modem_signals(ch);
|
||||
|
|
@ -2588,7 +2579,6 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
|
|||
}
|
||||
|
||||
switch (cmd) {
|
||||
|
||||
/* Here are all the standard ioctl's that we MUST implement */
|
||||
|
||||
case TCSBRK:
|
||||
|
|
@ -2801,7 +2791,6 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
|
|||
|
||||
/* set information for ditty */
|
||||
if (cmd == (DIGI_SETAW)) {
|
||||
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
rc = ch->ch_bd->bd_ops->drain(tty, 0);
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче