USB core

Took out the limitation that drivers had to take up 16 minors.  Now
they can use only 1 if they want to.

diff --git a/drivers/usb/class/printer.c b/drivers/usb/class/printer.c
index c3ac522ea24e040b0fc25ebe89f42dc313419bf5..abab738e601a4f8fb0248b738994020db393fdd0 100644 (file)
--- a/drivers/usb/class/printer.c
+++ b/drivers/usb/class/printer.c
@@ -1090,6 +1090,7 @@ static struct usb_driver usblp_driver = {
        disconnect:     usblp_disconnect,
        fops:           &usblp_fops,
        minor:          USBLP_MINOR_BASE,
+       num_minors:     USBLP_MINORS,
        id_table:       usblp_ids,
 };
 

diff --git a/drivers/usb/core/drivers.c b/drivers/usb/core/drivers.c
index ae96757ef9f6423e14392db239d01d827ca7c013..8b296a2b8001a792cb8420304846d925db2ec1f7 100644 (file)
--- a/drivers/usb/core/drivers.c
+++ b/drivers/usb/core/drivers.c
@@ -71,8 +71,10 @@ static ssize_t usb_driver_read(struct file *file, char *buf, size_t nbytes, loff
                int minor = driver->fops ? driver->minor : -1;
                if (minor == -1)
                        start += sprintf (start, "         %s\n", driver->name);
+               else if (driver->num_minors == 1)
+                       start += sprintf (start, "    %3d: %s\n", minor, driver->name);
                else
-                       start += sprintf (start, "%3d-%3d: %s\n", minor, minor + 15, driver->name);
+                       start += sprintf (start, "%3d-%3d: %s\n", minor, minor + driver->num_minors - 1, driver->name);
                if (start > end) {
                        start += sprintf(start, "(truncated)\n");
                        break;

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 8fe9219e66967aada7efdbcc1a9288272eb55858..a82ee30535512981980a08ed74b33624ee1a5795 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -59,7 +59,7 @@ LIST_HEAD(usb_driver_list);
 
 devfs_handle_t usb_devfs_handle;       /* /dev/usb dir. */
 
-static struct usb_driver *usb_minors[16];
+static struct usb_driver *usb_minors[256];
 
 /**
  *     usb_register - register a USB driver
@@ -72,12 +72,17 @@ static struct usb_driver *usb_minors[16];
  */
 int usb_register(struct usb_driver *new_driver)
 {
+       int i;
+
        if (new_driver->fops != NULL) {
-               if (usb_minors[new_driver->minor/16]) {
-                        err("error registering %s driver", new_driver->name);
-                       return -EINVAL;
+               for (i = new_driver->minor; i < new_driver->minor + new_driver->num_minors; ++i) {
+                       if (usb_minors[i]) {
+                               err("error registering %s driver", new_driver->name);
+                               return -EINVAL;
+                       }
                }
-               usb_minors[new_driver->minor/16] = new_driver;
+               for (i = new_driver->minor; i < new_driver->minor + new_driver->num_minors; ++i)
+                       usb_minors[i] = new_driver;
        }
 
        info("registered new driver %s", new_driver->name);
@@ -172,10 +177,12 @@ static void usb_drivers_purge(struct usb_driver *driver,struct usb_device *dev)
 void usb_deregister(struct usb_driver *driver)
 {
        struct list_head *tmp;
+       int i;
 
        info("deregistering driver %s", driver->name);
        if (driver->fops != NULL)
-               usb_minors[driver->minor/16] = NULL;
+               for (i = driver->minor; i < driver->minor + driver->num_minors; ++i)
+                       usb_minors[i] = NULL;
 
        /*
         * first we remove the driver, to be sure it doesn't get used by
@@ -2517,7 +2524,7 @@ int usb_new_device(struct usb_device *dev)
 static int usb_open(struct inode * inode, struct file * file)
 {
        int minor = minor(inode->i_rdev);
-       struct usb_driver *c = usb_minors[minor/16];
+       struct usb_driver *c = usb_minors[minor];
        int err = -ENODEV;
        struct file_operations *old_fops, *new_fops = NULL;
 

diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index d06d72ce2894fb0626735516c59466836ce281e6..58d55e3e1d66f326c2aa92f54b538621a7316dfe 100644 (file)
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -933,6 +933,7 @@ static struct usb_driver mdc800_usb_driver =
        disconnect:     mdc800_usb_disconnect,
        fops:           &mdc800_device_ops,
        minor:          MDC800_DEVICE_MINOR_BASE,
+       num_minors:     1,
        id_table:       mdc800_table
 };
 

diff --git a/drivers/usb/image/scanner.c b/drivers/usb/image/scanner.c
index 22eabc5a036832b89445e5c4f7d86268bdb7b7f6..d66b8e6eb86518bec1e58fdaf3d6ea30fefdefe6 100644 (file)
--- a/drivers/usb/image/scanner.c
+++ b/drivers/usb/image/scanner.c
@@ -1100,6 +1100,7 @@ usb_driver scanner_driver = {
        disconnect:     disconnect_scanner,
        fops:           &usb_scanner_fops,
        minor:          SCN_BASE_MNR,
+       num_minors:     SCN_MAX_MNR,
        id_table:       NULL, /* This would be scanner_device_ids, but we
                                 need to check every USB device, in case
                                 we match a user defined vendor/product ID. */

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 206531c7aef756402490421f8a96b67e035b801a..05b02b4c93fa60a1a71280996eec55bcc430fc37 100644 (file)
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -678,10 +678,11 @@ static void *hiddev_usbd_probe(struct usb_device *dev, unsigned int ifnum,
 
 
 static /* const */ struct usb_driver hiddev_driver = {
-       name:   "hiddev",
-       probe:  hiddev_usbd_probe,
-       fops:   &hiddev_fops,
-       minor:  HIDDEV_MINOR_BASE
+       name:           "hiddev",
+       probe:          hiddev_usbd_probe,
+       fops:           &hiddev_fops,
+       minor:          HIDDEV_MINOR_BASE,
+       num_minors:     HIDDEV_MINORS,
 };
 
 int __init hiddev_init(void)

diff --git a/drivers/usb/media/dabusb.c b/drivers/usb/media/dabusb.c
index e84169eacb5f368f4469d8fd55510837e5fcb72c..50d75410bbcd75b9d568967189b560fa57d425ca 100644 (file)
--- a/drivers/usb/media/dabusb.c
+++ b/drivers/usb/media/dabusb.c
@@ -801,6 +801,7 @@ static struct usb_driver dabusb_driver =
        disconnect:     dabusb_disconnect,
        fops:           &dabusb_fops,
        minor:          DABUSB_MINOR,
+       num_minors:     NRDABUSB,
        id_table:       dabusb_ids,
 };
 

diff --git a/drivers/usb/media/dsbr100.c b/drivers/usb/media/dsbr100.c
index ce61bfcbda8b935c007cb3c388c4cc2c3a3094ed..f4bdcaaa1fd3a026e6e597ade73fbd411f4fa086 100644 (file)
--- a/drivers/usb/media/dsbr100.c
+++ b/drivers/usb/media/dsbr100.c
@@ -128,8 +128,6 @@ static struct usb_driver usb_dsbr100_driver = {
        name:           "dsbr100",
        probe:          usb_dsbr100_probe,
        disconnect:     usb_dsbr100_disconnect,
-       fops:           NULL,
-       minor:          0,
        id_table:       usb_dsbr100_table,
 };
 

diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 9834ae7ff77082c481b6943bd0b4a75774830fad..3c435f78ef4baae16a423ba61e56d1ca23d3d881 100644 (file)
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -2138,6 +2138,7 @@ static struct usb_driver auerswald_driver = {
        disconnect:     auerswald_disconnect,
        fops:           &auerswald_fops,
        minor:          AUER_MINOR_BASE,
+       num_minors:     AUER_MAX_DEVICES,
        id_table:       auerswald_ids,
 };
 

diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index 96bb3a811e301a168c46248378cbe408e84181c9..b3f5d0b7bf7f0abdeb2c0bfbd4c8f60f389615cf 100644 (file)
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -517,6 +517,7 @@ static struct usb_driver rio_driver = {
        disconnect:     disconnect_rio,
        fops:           &usb_rio_fops,
        minor:          RIO_MINOR,
+       num_minors:     1,
        id_table:       rio_table,
 };
 

diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index bf21a0ca5ab4ce7a1359ebaa9dff7f0d9c41e551..fc2c72e4a4715fbd3ff463b56b87f2f843a8cbea 100644 (file)
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -187,6 +187,7 @@ static struct usb_driver skel_driver = {
        disconnect:     skel_disconnect,
        fops:           &skel_fops,
        minor:          USB_SKEL_MINOR_BASE,
+       num_minors:     MAX_DEVICES,
        id_table:       skel_table,
 };
 

diff --git a/include/linux/usb.h b/include/linux/usb.h
index f06fafb62ee1133d89840d5e38ac4ce2fb277a59..06a3f5c09e666813e3b261a3b15baf4d8b9b0284 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -493,6 +493,8 @@ struct usb_device_id {
  * @minor: Used with fops to simplify creating USB character devices.
  *     Such drivers have sixteen character devices, using the USB
  *     major number and starting with this minor number.
+ * @num_minors: Used with minor to specify how many minors are used by
+ *     this driver.
  * @ioctl: Used for drivers that want to talk to userspace through
  *     the "usbfs" filesystem.  This lets devices provide ways to
  *     expose information to user space regardless of where they
@@ -534,6 +536,7 @@ struct usb_driver {
 
        struct file_operations *fops;
        int minor;
+       int num_minors;
 
        struct semaphore serialize;