diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-02 06:51:15 -0500 |
---|---|---|
committer | Johan Hovold <johan@kernel.org> | 2017-03-16 05:13:37 -0400 |
commit | ef88f33fc1ee0a12a1e5eee7e4f70b7743100a19 (patch) | |
tree | 6611aadb6396fe174a3c3d657cef11391266c65e /drivers/usb/serial/usb-serial.c | |
parent | c2fef4564cae387c2f724a95350084c2e9371250 (diff) |
USB: serial: clean up endpoint and port-counter types
Use unsigned-char type for the endpoint and port counters.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index c20d90ed1ef2..e5b859ad15c6 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -728,12 +728,12 @@ static int usb_serial_probe(struct usb_interface *interface, | |||
728 | int buffer_size; | 728 | int buffer_size; |
729 | int i; | 729 | int i; |
730 | int j; | 730 | int j; |
731 | int num_interrupt_in = 0; | 731 | unsigned char num_interrupt_in = 0; |
732 | int num_interrupt_out = 0; | 732 | unsigned char num_interrupt_out = 0; |
733 | int num_bulk_in = 0; | 733 | unsigned char num_bulk_in = 0; |
734 | int num_bulk_out = 0; | 734 | unsigned char num_bulk_out = 0; |
735 | int num_ports = 0; | 735 | int num_ports = 0; |
736 | int max_endpoints; | 736 | unsigned char max_endpoints; |
737 | 737 | ||
738 | mutex_lock(&table_lock); | 738 | mutex_lock(&table_lock); |
739 | type = search_serial_device(interface); | 739 | type = search_serial_device(interface); |
@@ -879,7 +879,7 @@ static int usb_serial_probe(struct usb_interface *interface, | |||
879 | num_ports = MAX_NUM_PORTS; | 879 | num_ports = MAX_NUM_PORTS; |
880 | } | 880 | } |
881 | 881 | ||
882 | serial->num_ports = num_ports; | 882 | serial->num_ports = (unsigned char)num_ports; |
883 | serial->num_bulk_in = num_bulk_in; | 883 | serial->num_bulk_in = num_bulk_in; |
884 | serial->num_bulk_out = num_bulk_out; | 884 | serial->num_bulk_out = num_bulk_out; |
885 | serial->num_interrupt_in = num_interrupt_in; | 885 | serial->num_interrupt_in = num_interrupt_in; |
@@ -894,7 +894,7 @@ static int usb_serial_probe(struct usb_interface *interface, | |||
894 | max_endpoints = max(num_bulk_in, num_bulk_out); | 894 | max_endpoints = max(num_bulk_in, num_bulk_out); |
895 | max_endpoints = max(max_endpoints, num_interrupt_in); | 895 | max_endpoints = max(max_endpoints, num_interrupt_in); |
896 | max_endpoints = max(max_endpoints, num_interrupt_out); | 896 | max_endpoints = max(max_endpoints, num_interrupt_out); |
897 | max_endpoints = max(max_endpoints, (int)serial->num_ports); | 897 | max_endpoints = max(max_endpoints, serial->num_ports); |
898 | serial->num_port_pointers = max_endpoints; | 898 | serial->num_port_pointers = max_endpoints; |
899 | 899 | ||
900 | dev_dbg(ddev, "setting up %d port structure(s)\n", max_endpoints); | 900 | dev_dbg(ddev, "setting up %d port structure(s)\n", max_endpoints); |