lkml.org 
[lkml]   [2013]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 3/3] USB: serial: increase the number of devices we support
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

We had the limit of 255 USB to serial devices on one system for almost
15 years, with no complaints. But now it's time to move on from these
tiny "baby" systems, and bump the number up to 3000, which should last
us a few more years.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
drivers/usb/serial/usb-serial.c | 8 ++++++--
include/linux/usb/serial.h | 4 ----
2 files changed, 6 insertions(+), 6 deletions(-)

--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -43,6 +43,10 @@
#define DRIVER_AUTHOR "Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
#define DRIVER_DESC "USB Serial Driver core"

+#define SERIAL_TTY_MAJOR 188
+#define SERIAL_TTY_MINORS 3000 /* should be enough for a while */
+#define SERIAL_TTY_NO_MINOR (SERIAL_TTY_MINORS + 1)
+
/* There is no MODULE_DEVICE_TABLE for usbserial.c. Instead
the MODULE_DEVICE_TABLE declarations in each serial driver
cause the "hotplug" program to pull in whatever module is necessary
@@ -105,12 +109,12 @@ static int get_free_serial(struct usb_se

dev_dbg(&serial->interface->dev, "%s %d\n", __func__, num_ports);

- *minor = 0xffffffff;
+ *minor = SERIAL_TTY_NO_MINOR;
for (i = 0; i < num_ports; ++i) {
x = get_free_port(serial->port[i]);
if (x < 0)
goto error;
- if (*minor == 0xffffffff)
+ if (*minor == SERIAL_TTY_NO_MINOR)
*minor = x;
serial->port[i]->port_number = i;
}
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -19,10 +19,6 @@
#include <linux/sysrq.h>
#include <linux/kfifo.h>

-#define SERIAL_TTY_MAJOR 188 /* Nice legal number now */
-#define SERIAL_TTY_MINORS 254 /* loads of devices :) */
-#define SERIAL_TTY_NO_MINOR 0xffffffff /* No minor was assigned */
-
/* The maximum number of ports one device can grab at once */
#define MAX_NUM_PORTS 8


\
 
 \ /
  Last update: 2013-06-05 21:21    [W:0.164 / U:23.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site