Commit a40d8540 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

USB: kobil_sct: Get rid of unneeded priv->line_state 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7b1fc8bc

drivers/usb/serial/kobil_sct.c

+5 −10
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ struct kobil_private { 
	int filled;  // index of the last char in buf

	int cur_pos; // index of the next char to send in buf

	__u16 device_type;

	int line_state;

};
@@ -161,7 +160,6 @@ static int kobil_startup (struct usb_serial *serial) 
	priv->filled = 0;

	priv->cur_pos = 0;

	priv->device_type = le16_to_cpu(serial->dev->descriptor.idProduct);

	priv->line_state = 0;



	switch (priv->device_type){

	case KOBIL_ADAPTER_B_PRODUCT_ID:
@@ -226,7 +224,6 @@ static int kobil_open (struct usb_serial_port *port, struct file *filp) 


	dbg("%s - port %d", __FUNCTION__, port->number);

	priv = usb_get_serial_port_data(port);

	priv->line_state = 0;



	// someone sets the dev to 0 if the close method has been called

	port->interrupt_in_urb->dev = port->serial->dev;
@@ -524,14 +521,11 @@ static int kobil_tiocmget(struct usb_serial_port *port, struct file *file) 
	dbg("%s - port %d Send get_status_line_state URB returns: %i. Statusline: %02x", 

	    __FUNCTION__, port->number, result, transfer_buffer[0]);



	if ((transfer_buffer[0] & SUSBCR_GSL_DSR) != 0) {

		priv->line_state |= TIOCM_DSR;

	} else {

		priv->line_state &= ~TIOCM_DSR; 

	}



	result = 0;

	if ((transfer_buffer[0] & SUSBCR_GSL_DSR) != 0)

		result = TIOCM_DSR;

	kfree(transfer_buffer);

	return priv->line_state;

	return result;

}



static int  kobil_tiocmset(struct usb_serial_port *port, struct file *file,
@@ -544,6 +538,7 @@ static int kobil_tiocmset(struct usb_serial_port *port, struct file *file, 
	unsigned char *transfer_buffer;

	int transfer_buffer_length = 8;



	/* FIXME: locking ? */

	priv = usb_get_serial_port_data(port);

	if ((priv->device_type == KOBIL_USBTWIN_PRODUCT_ID) || (priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID)) {

		// This device doesn't support ioctl calls