linux-next: manual merge of the char-misc tree with the tty tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/char/pcmcia/synclink_cs.c between commits 2e124b4a390c ("TTY:
switch tty_flip_buffer_push") and 9fe8074b82ed ("TTY: synclink: Convert + to
| for bit operations") from the tty tree and commit 3d55399391c8 ("pcmcia: synclink_cs: cleanup checkpatch warnings") from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/char/pcmcia/synclink_cs.c
index d0c9852,29f6bec..0000000
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@@ -765,8 -771,11 +771,8 @@@ static void bh_handler(struct work_stru
  	struct tty_struct *tty;
  	int action;
  
 -	if (!info)
 -		return;
 -
  	if (debug_level >= DEBUG_LEVEL_BH)
- 		printk( "%s(%d):bh_handler(%s) entry\n",
+ 		printk("%s(%d):bh_handler(%s) entry\n",
  			__FILE__,__LINE__,info->device_name);
  
  	info->bh_running = true;
@@@ -889,8 -898,16 +896,8 @@@ static void rx_ready_async(MGSLPC_INFO 
  	unsigned char data, status, flag;
  	int fifo_count;
  	int work = 0;
-  	struct mgsl_icount *icount = &info->icount;
+ 	struct mgsl_icount *icount = &info->icount;
  
 -	if (!tty) {
 -		/* tty is not available anymore */
 -		issue_command(info, CHA, CMD_RXRESET);
 -		if (debug_level >= DEBUG_LEVEL_ISR)
 -			printk("%s(%d):rx_ready_async(tty=NULL)\n", __FILE__, __LINE__);
 -		return;
 -	}
 -
  	if (tcd) {
  		/* early termination, get FIFO count from RBCL register */
  		fifo_count = (unsigned char)(read_reg(info, CHA+RBCL) & 0x1f);
@@@ -1342,8 -1359,8 +1349,8 @@@ static void shutdown(MGSLPC_INFO * info
  	/* TODO:disable interrupts instead of reset to preserve signal states */
  	reset_device(info);
  
-  	if (!tty || tty->termios.c_cflag & HUPCL) {
+ 	if (!tty || tty->termios.c_cflag & HUPCL) {
 -		info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
 +		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
  		set_signals(info);
  	}
  
@@@ -1405,12 -1422,12 +1412,12 @@@ static void mgslpc_change_params(MGSLPC
  
  	cflag = tty->termios.c_cflag;
  
 -	/* if B0 rate (hangup) specified then negate DTR and RTS */
 -	/* otherwise assert DTR and RTS */
 +	/* if B0 rate (hangup) specified then negate RTS and DTR */
 +	/* otherwise assert RTS and DTR */
-  	if (cflag & CBAUD)
+ 	if (cflag & CBAUD)
 -		info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
 +		info->serial_signals |= SerialSignal_RTS | SerialSignal_DTR;
  	else
 -		info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
 +		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
  
  	/* byte size and parity */
  
@@@ -2301,10 -2318,10 +2308,10 @@@ static void mgslpc_set_termios(struct t
  	/* Handle transition to B0 status */
  	if (old_termios->c_cflag & CBAUD &&
  	    !(tty->termios.c_cflag & CBAUD)) {
 -		info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
 +		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
- 		spin_lock_irqsave(&info->lock,flags);
- 	 	set_signals(info);
- 		spin_unlock_irqrestore(&info->lock,flags);
+ 		spin_lock_irqsave(&info->lock, flags);
+ 		set_signals(info);
+ 		spin_unlock_irqrestore(&info->lock, flags);
  	}
  
  	/* Handle transition away from B0 status */
@@@ -2462,13 -2479,13 +2469,13 @@@ static void dtr_rts(struct tty_port *po
  	MGSLPC_INFO *info = container_of(port, MGSLPC_INFO, port);
  	unsigned long flags;
  
- 	spin_lock_irqsave(&info->lock,flags);
+ 	spin_lock_irqsave(&info->lock, flags);
  	if (onoff)
 -		info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
 +		info->serial_signals |= SerialSignal_RTS | SerialSignal_DTR;
  	else
 -		info->serial_signals &= ~SerialSignal_RTS + SerialSignal_DTR;
 +		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
  	set_signals(info);
- 	spin_unlock_irqrestore(&info->lock,flags);
+ 	spin_unlock_irqrestore(&info->lock, flags);
  }

Attachment: pgprPNx9F1tKZ.pgp
Description: PGP signature