linux-next: manual merge of the staging tree with the usb tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
("USB: serial: ports: add minor and port number") from the usb tree and
commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style
CamelCases") from the staging 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/staging/serqt_usb2/serqt_usb2.c
index 880f5c0,39de5e0..0000000
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@@ -870,10 -870,10 +870,10 @@@ static int qt_open(struct tty_struct *t
  	usb_clear_halt(serial->dev, port->read_urb->pipe);
  	port0->open_ports++;
  
- 	result = qt_get_device(serial, &port0->DeviceData);
+ 	result = qt_get_device(serial, &port0->device_data);
  
  	/* Port specific setups */
- 	result = qt_open_channel(serial, port->port_number, &ChannelData);
 -	result = qt_open_channel(serial, port->number, &channel_data);
++	result = qt_open_channel(serial, port->port_number, &channel_data);
  	if (result < 0) {
  		dev_dbg(&port->dev, "qt_open_channel failed\n");
  		return result;
@@@ -1239,23 -1245,25 +1239,23 @@@ static void qt_set_termios(struct tty_s
  
  	/* Now determine flow control */
  	if (cflag & CRTSCTS) {
 -		dev_dbg(&port->dev, "%s - Enabling HW flow control port %d\n",
 -			__func__, port->number);
 +		dev_dbg(&port->dev, "%s - Enabling HW flow control\n", __func__);
  
  		/* Enable RTS/CTS flow control */
- 		status = BoxSetHW_FlowCtrl(port->serial, index, 1);
+ 		status = box_set_hw_flow_ctrl(port->serial, index, 1);
  
  		if (status < 0) {
- 			dev_dbg(&port->dev, "BoxSetHW_FlowCtrl failed\n");
+ 			dev_dbg(&port->dev, "box_set_hw_flow_ctrl failed\n");
  			return;
  		}
  	} else {
  		/* Disable RTS/CTS flow control */
  		dev_dbg(&port->dev,
 -			"%s - disabling HW flow control port %d\n",
 -			__func__, port->number);
 +			"%s - disabling HW flow control\n", __func__);
  
- 		status = BoxSetHW_FlowCtrl(port->serial, index, 0);
+ 		status = box_set_hw_flow_ctrl(port->serial, index, 0);
  		if (status < 0) {
- 			dev_dbg(&port->dev, "BoxSetHW_FlowCtrl failed\n");
+ 			dev_dbg(&port->dev, "box_set_hw_flow_ctrl failed\n");
  			return;
  		}
  
@@@ -1324,12 -1332,12 +1324,12 @@@ static inline int qt_real_tiocmget(stru
  	int status;
  	unsigned int index;
  
 -	index = tty->index - serial->minor;
 +	index = port->port_number;
  	status =
- 	    BoxGetRegister(port->serial, index, MODEM_CONTROL_REGISTER, &mcr);
+ 	    box_get_register(port->serial, index, MODEM_CONTROL_REGISTER, &mcr);
  	if (status >= 0) {
  		status =
- 		    BoxGetRegister(port->serial, index,
+ 		    box_get_register(port->serial, index,
  				   MODEM_STATUS_REGISTER, &msr);
  
  	}
@@@ -1363,9 -1371,9 +1363,9 @@@ static inline int qt_real_tiocmset(stru
  	int status;
  	unsigned int index;
  
 -	index = tty->index - serial->minor;
 +	index = port->port_number;
  	status =
- 	    BoxGetRegister(port->serial, index, MODEM_CONTROL_REGISTER, &mcr);
+ 	    box_get_register(port->serial, index, MODEM_CONTROL_REGISTER, &mcr);
  	if (status < 0)
  		return -ESPIPE;

Attachment: pgp1MCEXYTUIH.pgp
Description: PGP signature