Commit e352d3f1 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman

staging: dgnc: alignment style

checkpatch was warning us that the alignment should match the open
parenthesis.
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f418259
...@@ -518,7 +518,7 @@ static void cls_param(struct tty_struct *tty) ...@@ -518,7 +518,7 @@ static void cls_param(struct tty_struct *tty)
* unit is NOT open * unit is NOT open
*/ */
if (!(ch->ch_tun.un_flags & UN_ISOPEN) && if (!(ch->ch_tun.un_flags & UN_ISOPEN) &&
(un->un_type == DGNC_PRINT)) (un->un_type == DGNC_PRINT))
baud = C_BAUD(ch->ch_pun.un_tty) & 0xff; baud = C_BAUD(ch->ch_pun.un_tty) & 0xff;
else else
baud = C_BAUD(ch->ch_tun.un_tty) & 0xff; baud = C_BAUD(ch->ch_tun.un_tty) & 0xff;
...@@ -532,7 +532,7 @@ static void cls_param(struct tty_struct *tty) ...@@ -532,7 +532,7 @@ static void cls_param(struct tty_struct *tty)
jindex = baud; jindex = baud;
if ((iindex >= 0) && (iindex < 4) && (jindex >= 0) && if ((iindex >= 0) && (iindex < 4) && (jindex >= 0) &&
(jindex < 16)) { (jindex < 16)) {
baud = bauds[iindex][jindex]; baud = bauds[iindex][jindex];
} else { } else {
baud = 0; baud = 0;
...@@ -641,7 +641,7 @@ static void cls_param(struct tty_struct *tty) ...@@ -641,7 +641,7 @@ static void cls_param(struct tty_struct *tty)
* disable flow control * disable flow control
*/ */
if ((ch->ch_startc == _POSIX_VDISABLE) || if ((ch->ch_startc == _POSIX_VDISABLE) ||
(ch->ch_stopc == _POSIX_VDISABLE)) (ch->ch_stopc == _POSIX_VDISABLE))
cls_set_no_output_flow_control(ch); cls_set_no_output_flow_control(ch);
else else
cls_set_ixon_flow_control(ch); cls_set_ixon_flow_control(ch);
...@@ -657,7 +657,7 @@ static void cls_param(struct tty_struct *tty) ...@@ -657,7 +657,7 @@ static void cls_param(struct tty_struct *tty)
* flow control * flow control
*/ */
if ((ch->ch_startc == _POSIX_VDISABLE) || if ((ch->ch_startc == _POSIX_VDISABLE) ||
(ch->ch_stopc == _POSIX_VDISABLE)) (ch->ch_stopc == _POSIX_VDISABLE))
cls_set_no_input_flow_control(ch); cls_set_no_input_flow_control(ch);
else else
cls_set_ixoff_flow_control(ch); cls_set_ixoff_flow_control(ch);
...@@ -933,7 +933,7 @@ static void cls_flush_uart_write(struct channel_t *ch) ...@@ -933,7 +933,7 @@ static void cls_flush_uart_write(struct channel_t *ch)
return; return;
writeb((UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_XMIT), writeb((UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_XMIT),
&ch->ch_cls_uart->isr_fcr); &ch->ch_cls_uart->isr_fcr);
udelay(10); udelay(10);
ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM); ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
...@@ -979,7 +979,7 @@ static void cls_copy_data_from_queue_to_uart(struct channel_t *ch) ...@@ -979,7 +979,7 @@ static void cls_copy_data_from_queue_to_uart(struct channel_t *ch)
/* If port is "stopped", don't send any data to the UART */ /* If port is "stopped", don't send any data to the UART */
if ((ch->ch_flags & CH_FORCED_STOP) || if ((ch->ch_flags & CH_FORCED_STOP) ||
(ch->ch_flags & CH_BREAK_SENDING)) (ch->ch_flags & CH_BREAK_SENDING))
goto exit_unlock; goto exit_unlock;
if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM))) if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM)))
...@@ -1169,7 +1169,7 @@ static void cls_uart_init(struct channel_t *ch) ...@@ -1169,7 +1169,7 @@ static void cls_uart_init(struct channel_t *ch)
readb(&ch->ch_cls_uart->txrx); readb(&ch->ch_cls_uart->txrx);
writeb((UART_FCR_ENABLE_FIFO|UART_FCR_CLEAR_RCVR|UART_FCR_CLEAR_XMIT), writeb((UART_FCR_ENABLE_FIFO|UART_FCR_CLEAR_RCVR|UART_FCR_CLEAR_XMIT),
&ch->ch_cls_uart->isr_fcr); &ch->ch_cls_uart->isr_fcr);
udelay(10); udelay(10);
ch->ch_flags |= (CH_FIFO_ENABLED | CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM); ch->ch_flags |= (CH_FIFO_ENABLED | CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
......
...@@ -237,7 +237,7 @@ static int dgnc_start(void) ...@@ -237,7 +237,7 @@ static int dgnc_start(void)
} }
dev = device_create(dgnc_class, NULL, dev = device_create(dgnc_class, NULL,
MKDEV(dgnc_Major, 0), MKDEV(dgnc_Major, 0),
NULL, "dgnc_mgmt"); NULL, "dgnc_mgmt");
if (IS_ERR(dev)) { if (IS_ERR(dev)) {
rc = PTR_ERR(dev); rc = PTR_ERR(dev);
......
...@@ -1390,7 +1390,7 @@ static void neo_copy_data_from_queue_to_uart(struct channel_t *ch) ...@@ -1390,7 +1390,7 @@ static void neo_copy_data_from_queue_to_uart(struct channel_t *ch)
/* If port is "stopped", don't send any data to the UART */ /* If port is "stopped", don't send any data to the UART */
if ((ch->ch_flags & CH_FORCED_STOP) || if ((ch->ch_flags & CH_FORCED_STOP) ||
(ch->ch_flags & CH_BREAK_SENDING)) (ch->ch_flags & CH_BREAK_SENDING))
goto exit_unlock; goto exit_unlock;
/* /*
......
...@@ -365,12 +365,12 @@ int dgnc_tty_init(struct dgnc_board *brd) ...@@ -365,12 +365,12 @@ int dgnc_tty_init(struct dgnc_board *brd)
struct device *classp; struct device *classp;
classp = tty_register_device(&brd->SerialDriver, i, classp = tty_register_device(&brd->SerialDriver, i,
&(ch->ch_bd->pdev->dev)); &(ch->ch_bd->pdev->dev));
ch->ch_tun.un_sysfs = classp; ch->ch_tun.un_sysfs = classp;
dgnc_create_tty_sysfs(&ch->ch_tun, classp); dgnc_create_tty_sysfs(&ch->ch_tun, classp);
classp = tty_register_device(&brd->PrintDriver, i, classp = tty_register_device(&brd->PrintDriver, i,
&(ch->ch_bd->pdev->dev)); &(ch->ch_bd->pdev->dev));
ch->ch_pun.un_sysfs = classp; ch->ch_pun.un_sysfs = classp;
dgnc_create_tty_sysfs(&ch->ch_pun, classp); dgnc_create_tty_sysfs(&ch->ch_pun, classp);
} }
...@@ -934,7 +934,7 @@ void dgnc_wakeup_writes(struct channel_t *ch) ...@@ -934,7 +934,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)
if (ch->ch_tun.un_flags & UN_ISOPEN) { if (ch->ch_tun.un_flags & UN_ISOPEN) {
if ((ch->ch_tun.un_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && if ((ch->ch_tun.un_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
ch->ch_tun.un_tty->ldisc->ops->write_wakeup) { ch->ch_tun.un_tty->ldisc->ops->write_wakeup) {
spin_unlock_irqrestore(&ch->ch_lock, flags); spin_unlock_irqrestore(&ch->ch_lock, flags);
(ch->ch_tun.un_tty->ldisc->ops->write_wakeup)(ch->ch_tun.un_tty); (ch->ch_tun.un_tty->ldisc->ops->write_wakeup)(ch->ch_tun.un_tty);
spin_lock_irqsave(&ch->ch_lock, flags); spin_lock_irqsave(&ch->ch_lock, flags);
...@@ -948,7 +948,7 @@ void dgnc_wakeup_writes(struct channel_t *ch) ...@@ -948,7 +948,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)
*/ */
if (ch->ch_tun.un_flags & UN_EMPTY) { if (ch->ch_tun.un_flags & UN_EMPTY) {
if ((qlen == 0) && if ((qlen == 0) &&
(ch->ch_bd->bd_ops->get_uart_bytes_left(ch) == 0)) { (ch->ch_bd->bd_ops->get_uart_bytes_left(ch) == 0)) {
ch->ch_tun.un_flags &= ~(UN_EMPTY); ch->ch_tun.un_flags &= ~(UN_EMPTY);
/* /*
...@@ -976,7 +976,7 @@ void dgnc_wakeup_writes(struct channel_t *ch) ...@@ -976,7 +976,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)
if (ch->ch_pun.un_flags & UN_ISOPEN) { if (ch->ch_pun.un_flags & UN_ISOPEN) {
if ((ch->ch_pun.un_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && if ((ch->ch_pun.un_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
ch->ch_pun.un_tty->ldisc->ops->write_wakeup) { ch->ch_pun.un_tty->ldisc->ops->write_wakeup) {
spin_unlock_irqrestore(&ch->ch_lock, flags); spin_unlock_irqrestore(&ch->ch_lock, flags);
(ch->ch_pun.un_tty->ldisc->ops->write_wakeup)(ch->ch_pun.un_tty); (ch->ch_pun.un_tty->ldisc->ops->write_wakeup)(ch->ch_pun.un_tty);
spin_lock_irqsave(&ch->ch_lock, flags); spin_lock_irqsave(&ch->ch_lock, flags);
...@@ -1038,7 +1038,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) ...@@ -1038,7 +1038,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
* sleep waiting for it to happen or they cancel the open. * sleep waiting for it to happen or they cancel the open.
*/ */
rc = wait_event_interruptible(brd->state_wait, rc = wait_event_interruptible(brd->state_wait,
(brd->state & BOARD_READY)); (brd->state & BOARD_READY));
if (rc) if (rc)
return rc; return rc;
...@@ -1440,7 +1440,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) ...@@ -1440,7 +1440,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
*/ */
if ((un->un_type == DGNC_PRINT) && (ch->ch_flags & CH_PRON)) { if ((un->un_type == DGNC_PRINT) && (ch->ch_flags & CH_PRON)) {
dgnc_wmove(ch, ch->ch_digi.digi_offstr, dgnc_wmove(ch, ch->ch_digi.digi_offstr,
(int)ch->ch_digi.digi_offlen); (int)ch->ch_digi.digi_offlen);
ch->ch_flags &= ~CH_PRON; ch->ch_flags &= ~CH_PRON;
} }
...@@ -1487,7 +1487,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) ...@@ -1487,7 +1487,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
*/ */
if ((un->un_type == DGNC_PRINT) && (ch->ch_flags & CH_PRON)) { if ((un->un_type == DGNC_PRINT) && (ch->ch_flags & CH_PRON)) {
dgnc_wmove(ch, ch->ch_digi.digi_offstr, dgnc_wmove(ch, ch->ch_digi.digi_offstr,
(int)ch->ch_digi.digi_offlen); (int)ch->ch_digi.digi_offlen);
ch->ch_flags &= ~CH_PRON; ch->ch_flags &= ~CH_PRON;
} }
} }
...@@ -1690,7 +1690,7 @@ static int dgnc_tty_put_char(struct tty_struct *tty, unsigned char c) ...@@ -1690,7 +1690,7 @@ static int dgnc_tty_put_char(struct tty_struct *tty, unsigned char c)
* In here exists all the Transparent Print magic as well. * In here exists all the Transparent Print magic as well.
*/ */
static int dgnc_tty_write(struct tty_struct *tty, static int dgnc_tty_write(struct tty_struct *tty,
const unsigned char *buf, int count) const unsigned char *buf, int count)
{ {
struct channel_t *ch = NULL; struct channel_t *ch = NULL;
struct un_t *un = NULL; struct un_t *un = NULL;
...@@ -1756,7 +1756,7 @@ static int dgnc_tty_write(struct tty_struct *tty, ...@@ -1756,7 +1756,7 @@ static int dgnc_tty_write(struct tty_struct *tty,
*/ */
if ((un->un_type == DGNC_PRINT) && !(ch->ch_flags & CH_PRON)) { if ((un->un_type == DGNC_PRINT) && !(ch->ch_flags & CH_PRON)) {
dgnc_wmove(ch, ch->ch_digi.digi_onstr, dgnc_wmove(ch, ch->ch_digi.digi_onstr,
(int)ch->ch_digi.digi_onlen); (int)ch->ch_digi.digi_onlen);
head = (ch->ch_w_head) & tmask; head = (ch->ch_w_head) & tmask;
ch->ch_flags |= CH_PRON; ch->ch_flags |= CH_PRON;
} }
...@@ -1767,7 +1767,7 @@ static int dgnc_tty_write(struct tty_struct *tty, ...@@ -1767,7 +1767,7 @@ static int dgnc_tty_write(struct tty_struct *tty,
*/ */
if ((un->un_type != DGNC_PRINT) && (ch->ch_flags & CH_PRON)) { if ((un->un_type != DGNC_PRINT) && (ch->ch_flags & CH_PRON)) {
dgnc_wmove(ch, ch->ch_digi.digi_offstr, dgnc_wmove(ch, ch->ch_digi.digi_offstr,
(int)ch->ch_digi.digi_offlen); (int)ch->ch_digi.digi_offlen);
head = (ch->ch_w_head) & tmask; head = (ch->ch_w_head) & tmask;
ch->ch_flags &= ~CH_PRON; ch->ch_flags &= ~CH_PRON;
} }
...@@ -1880,7 +1880,7 @@ static int dgnc_tty_tiocmget(struct tty_struct *tty) ...@@ -1880,7 +1880,7 @@ static int dgnc_tty_tiocmget(struct tty_struct *tty)
*/ */
static int dgnc_tty_tiocmset(struct tty_struct *tty, static int dgnc_tty_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear) unsigned int set, unsigned int clear)
{ {
struct dgnc_board *bd; struct dgnc_board *bd;
struct channel_t *ch; struct channel_t *ch;
...@@ -2547,7 +2547,7 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty) ...@@ -2547,7 +2547,7 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty)
* The usual assortment of ioctl's * The usual assortment of ioctl's
*/ */
static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
struct dgnc_board *bd; struct dgnc_board *bd;
struct channel_t *ch; struct channel_t *ch;
......
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