From: Bernd Bassimir Date: Fri, 14 Jun 2013 14:55:58 +0000 (+0200) Subject: staging: serqt_usb2: lines over 80 characters fixed X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ef2af12262cb3cef02b6ccb93538b3d6c800bfb9;p=deliverable%2Flinux.git staging: serqt_usb2: lines over 80 characters fixed Changed name of one variable, so that all lines are now below 80 characters. Signed-off-by: Bernd Bassimir Signed-off-by: Nico Doerr Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c index 0c87c6ff0ee0..39de5e021ccb 100644 --- a/drivers/staging/serqt_usb2/serqt_usb2.c +++ b/drivers/staging/serqt_usb2/serqt_usb2.c @@ -513,14 +513,14 @@ static int qt_set_device(struct usb_serial *serial, return result; } -static int qt_open_channel(struct usb_serial *serial, __u16 uart_number, +static int qt_open_channel(struct usb_serial *serial, __u16 uart_num, struct qt_open_channel_data *pdevice_data) { int result; result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), QT_OPEN_CLOSE_CHANNEL, - USBD_TRANSFER_DIRECTION_IN, 1, uart_number, + USBD_TRANSFER_DIRECTION_IN, 1, uart_num, pdevice_data, sizeof(struct qt_open_channel_data), 300); @@ -528,13 +528,13 @@ static int qt_open_channel(struct usb_serial *serial, __u16 uart_number, } -static int qt_close_channel(struct usb_serial *serial, __u16 uart_number) +static int qt_close_channel(struct usb_serial *serial, __u16 uart_num) { int result; result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), QT_OPEN_CLOSE_CHANNEL, - USBD_TRANSFER_DIRECTION_OUT, 0, uart_number, + USBD_TRANSFER_DIRECTION_OUT, 0, uart_num, NULL, 0, 300); return result; @@ -546,7 +546,7 @@ static int qt_close_channel(struct usb_serial *serial, __u16 uart_number) * issuse a GET_REGISTER vendor-spcific request on the default control pipe * If successful, fills in the p_value with the register value asked for ****************************************************************************/ -static int box_get_register(struct usb_serial *serial, unsigned short uart_number, +static int box_get_register(struct usb_serial *serial, unsigned short uart_num, unsigned short register_num, __u8 *p_value) { int result; @@ -557,7 +557,7 @@ static int box_get_register(struct usb_serial *serial, unsigned short uart_numbe result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), QT_GET_SET_REGISTER, 0xC0, register_num, - uart_number, (void *)p_value, sizeof(*p_value), 300); + uart_num, (void *)p_value, sizeof(*p_value), 300); return result; } @@ -567,7 +567,7 @@ static int box_get_register(struct usb_serial *serial, unsigned short uart_numbe * issuse a GET_REGISTER vendor-spcific request on the default control pipe * If successful, fills in the p_value with the register value asked for ****************************************************************************/ -static int box_set_register(struct usb_serial *serial, unsigned short uart_number, +static int box_set_register(struct usb_serial *serial, unsigned short uart_num, unsigned short register_num, unsigned short value) { int result; @@ -580,12 +580,12 @@ static int box_set_register(struct usb_serial *serial, unsigned short uart_numbe /* result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), QT_GET_SET_REGISTER, 0xC0, register_num, - uart_number, NULL, 0, 300); + uart_num, NULL, 0, 300); */ result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), - QT_GET_SET_REGISTER, 0x40, reg_and_byte, uart_number, + QT_GET_SET_REGISTER, 0x40, reg_and_byte, uart_num, NULL, 0, 300); return result; @@ -596,13 +596,13 @@ static int box_set_register(struct usb_serial *serial, unsigned short uart_numbe * issues a SET_UART vendor-specific request on the default control pipe * If successful sets baud rate divisor and LCR value */ -static int qt_setuart(struct usb_serial *serial, unsigned short uart_number, +static int qt_setuart(struct usb_serial *serial, unsigned short uart_num, unsigned short default_divisor, unsigned char default_lcr) { int result; unsigned short uart_num_and_lcr; - uart_num_and_lcr = (default_lcr << 8) + uart_number; + uart_num_and_lcr = (default_lcr << 8) + uart_num; result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),