aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-06-19 10:34:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-20 19:20:24 -0400
commit996a776544cc8a71653ffa95a89c317f33d2cb4a (patch)
treebb5a96d7b62dc12701a2bfbe0433e0152d91ce23 /drivers/usb/serial
parentfec1868e23099023bc545e199b78d99840b1abc9 (diff)
USB: serial: Remove unused s_priv variable
s_priv was set but never used in keyspan_open() and keyspan_close(), remove it. This also makes the serial variable in keyspan_open() unused since it's only use was to set s_priv, so it is also removed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/keyspan.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index a1b99243dac9..9a0ca8355905 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -1036,15 +1036,12 @@ static int keyspan_write_room(struct tty_struct *tty)
1036static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port) 1036static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
1037{ 1037{
1038 struct keyspan_port_private *p_priv; 1038 struct keyspan_port_private *p_priv;
1039 struct keyspan_serial_private *s_priv;
1040 struct usb_serial *serial = port->serial;
1041 const struct keyspan_device_details *d_details; 1039 const struct keyspan_device_details *d_details;
1042 int i, err; 1040 int i, err;
1043 int baud_rate, device_port; 1041 int baud_rate, device_port;
1044 struct urb *urb; 1042 struct urb *urb;
1045 unsigned int cflag = 0; 1043 unsigned int cflag = 0;
1046 1044
1047 s_priv = usb_get_serial_data(serial);
1048 p_priv = usb_get_serial_port_data(port); 1045 p_priv = usb_get_serial_port_data(port);
1049 d_details = p_priv->device_details; 1046 d_details = p_priv->device_details;
1050 1047
@@ -1130,10 +1127,8 @@ static void keyspan_close(struct usb_serial_port *port)
1130{ 1127{
1131 int i; 1128 int i;
1132 struct usb_serial *serial = port->serial; 1129 struct usb_serial *serial = port->serial;
1133 struct keyspan_serial_private *s_priv;
1134 struct keyspan_port_private *p_priv; 1130 struct keyspan_port_private *p_priv;
1135 1131
1136 s_priv = usb_get_serial_data(serial);
1137 p_priv = usb_get_serial_port_data(port); 1132 p_priv = usb_get_serial_port_data(port);
1138 1133
1139 p_priv->rts_state = 0; 1134 p_priv->rts_state = 0;