From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752863AbcELJBy (ORCPT ); Thu, 12 May 2016 05:01:54 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33316 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752764AbcELIu1 (ORCPT ); Thu, 12 May 2016 04:50:27 -0400 From: Mathieu OTHACEHE To: johan@kernel.org Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Mathieu OTHACEHE Subject: [PATCH 14/36] usb: serial: ti_usb_3410_5052: Use macros instead of magic values Date: Thu, 12 May 2016 10:48:46 +0200 Message-Id: <1463042948-12205-15-git-send-email-m.othacehe@gmail.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1463042948-12205-1-git-send-email-m.othacehe@gmail.com> References: <1463042948-12205-1-git-send-email-m.othacehe@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use macros to define 3410 and 5052 baud bases and remove useless casting. Use macro to define usb download timeout. Signed-off-by: Mathieu OTHACEHE --- drivers/usb/serial/ti_usb_3410_5052.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 00ae52e..91ea1b5 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -259,10 +259,12 @@ struct ti_firmware_header { #define TI_DRIVER_AUTHOR "Al Borchers " #define TI_DRIVER_DESC "TI USB 3410/5052 Serial Driver" -#define TI_FIRMWARE_BUF_SIZE 16284 +#define TI_3410_BAUD_BASE 923077 +#define TI_5052_BAUD_BASE 461538 +#define TI_FIRMWARE_BUF_SIZE 16284 #define TI_TRANSFER_TIMEOUT 2 - +#define TI_DOWNLOAD_TIMEOUT 1000 #define TI_DEFAULT_CLOSING_WAIT 4000 /* in .01 secs */ #define TI_EXTRA_VID_PID_COUNT 5 @@ -875,9 +877,9 @@ static void ti_set_termios(struct tty_struct *tty, if (!baud) baud = 9600; if (tport->tp_tdev->td_is_3410) - config->wBaudRate = (__u16)((923077 + baud/2) / baud); + config->wBaudRate = (TI_3410_BAUD_BASE + baud / 2) / baud; else - config->wBaudRate = (__u16)((461538 + baud/2) / baud); + config->wBaudRate = (TI_5052_BAUD_BASE + baud / 2) / baud; /* FIXME: Should calculate resulting baud here and report it back */ if ((C_BAUD(tty)) != B0) @@ -1123,6 +1125,7 @@ static int ti_get_serial_info(struct ti_port *tport, struct usb_serial_port *port = tport->tp_port; struct serial_struct ret_serial; unsigned cwait; + int baud_base; if (!ret_arg) return -EFAULT; @@ -1133,11 +1136,16 @@ static int ti_get_serial_info(struct ti_port *tport, memset(&ret_serial, 0, sizeof(ret_serial)); + if (tport->tp_tdev->td_is_3410) + baud_base = TI_3410_BAUD_BASE; + else + baud_base = TI_5052_BAUD_BASE; + ret_serial.type = PORT_16550A; ret_serial.line = port->minor; ret_serial.port = port->port_number; ret_serial.xmit_fifo_size = kfifo_size(&port->write_fifo); - ret_serial.baud_base = tport->tp_tdev->td_is_3410 ? 921600 : 460800; + ret_serial.baud_base = baud_base; ret_serial.closing_wait = cwait; if (copy_to_user(ret_arg, &ret_serial, sizeof(*ret_arg))) @@ -1296,8 +1304,8 @@ static int ti_do_download(struct usb_device *dev, int pipe, dev_dbg(&dev->dev, "%s - downloading firmware\n", __func__); for (pos = 0; pos < size; pos += done) { len = min(size - pos, TI_DOWNLOAD_MAX_PACKET_SIZE); - status = usb_bulk_msg(dev, pipe, buffer + pos, len, - &done, 1000); + status = usb_bulk_msg(dev, pipe, buffer + pos, len, &done, + TI_DOWNLOAD_TIMEOUT); if (status) break; } -- 2.8.2