[PATCH] usb cleanup

	switched to devfs_remove(), killed gratitious devfs_handle_t field.

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 92437d328fa33af3f1d1790d837694a99351b06d..1b19d5c0404fbe88d5bd8f3399e67e8c045d290b 100644 (file)
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -781,6 +781,6 @@ int __init hiddev_init(void)
 
 void __exit hiddev_exit(void)
 {
-       devfs_unregister(hiddev_devfs_handle);
        usb_deregister(&hiddev_driver);
+       devfs_remove("usb/hid");
 }

diff --git a/drivers/usb/misc/tiglusb.c b/drivers/usb/misc/tiglusb.c
index b2ed1ed76bfd3db427278ec54e7dd74a55b3bb21..3c590e9f34572ea28f894d01ef521439ebda2caa 100644 (file)
--- a/drivers/usb/misc/tiglusb.c
+++ b/drivers/usb/misc/tiglusb.c
@@ -54,8 +54,6 @@
 static tiglusb_t tiglusb[MAXTIGL];
 static int timeout = TIMAXTIME;        /* timeout in tenth of seconds     */
 
-static devfs_handle_t devfs_handle;
-
 /*---------- misc functions ------------------------------------------- */
 
 /*
@@ -334,7 +332,7 @@ tiglusb_probe (struct usb_interface *intf,
        int minor = -1;
        int i;
        ptiglusb_t s;
-       char name[8];
+       char name[32];
 
        dbg ("probing vendor id 0x%x, device id 0x%x",
             dev->descriptor.idVendor, dev->descriptor.idProduct);
@@ -378,13 +376,12 @@ tiglusb_probe (struct usb_interface *intf,
        up (&s->mutex);
        dbg ("bound to interface");
 
-       sprintf (name, "%d", s->minor);
+       sprintf (name, "ticables/usb/%d", s->minor);
        dbg ("registering to devfs : major = %d, minor = %d, node = %s",
             TIUSB_MAJOR, (TIUSB_MINOR + s->minor), name);
-       s->devfs =
-           devfs_register (devfs_handle, name, DEVFS_FL_DEFAULT, TIUSB_MAJOR,
-                           TIUSB_MINOR + s->minor, S_IFCHR | S_IRUGO | S_IWUGO,
-                           &tiglusb_fops, NULL);
+       devfs_register(NULL, name, DEVFS_FL_DEFAULT, TIUSB_MAJOR,
+                      TIUSB_MINOR + s->minor, S_IFCHR | S_IRUGO | S_IWUGO,
+                      &tiglusb_fops, NULL);
 
        /* Display firmware version */
        info ("link cable version %i.%02x",
@@ -414,8 +411,7 @@ tiglusb_disconnect (struct usb_interface *intf)
        s->dev = NULL;
        s->opened = 0;
 
-       devfs_unregister (s->devfs);
-       s->devfs = NULL;
+       devfs_remove (name, "ticables/usb/%d", s->minor);
 
        info ("device %d removed", s->minor);
 
@@ -485,7 +481,7 @@ tiglusb_init (void)
        }
 
        /* Use devfs, tree: /dev/ticables/usb/[0..3] */
-       devfs_handle = devfs_mk_dir (NULL, "ticables/usb", NULL);
+       devfs_mk_dir (NULL, "ticables/usb", NULL);
 
        /* register USB module */
        result = usb_register (&tiglusb_driver);
@@ -506,7 +502,7 @@ static void __exit
 tiglusb_cleanup (void)
 {
        usb_deregister (&tiglusb_driver);
-       devfs_unregister (devfs_handle);
+       devfs_remove("ticables/usb");
        unregister_chrdev (TIUSB_MAJOR, "tiglusb");
 }
 

diff --git a/drivers/usb/misc/tiglusb.h b/drivers/usb/misc/tiglusb.h
index de63e33b0ae6322746c432e2816f2b081da3cd12..627a3728de52143d2b17392b7d4b524fa645240f 100644 (file)
--- a/drivers/usb/misc/tiglusb.h
+++ b/drivers/usb/misc/tiglusb.h
@@ -38,7 +38,6 @@ typedef struct
        wait_queue_head_t       remove_ok;
 
        int             minor;                  /* which minor dev #? */
-       devfs_handle_t  devfs;                  /* devfs device */
 
        driver_state_t  state;                  /* started/stopped */
        int             opened;                 /* tru if open */