|
@@ -236,13 +236,6 @@ EXPORT_SYMBOL_GPL(usb_register_dev);
|
|
void usb_deregister_dev(struct usb_interface *intf,
|
|
void usb_deregister_dev(struct usb_interface *intf,
|
|
struct usb_class_driver *class_driver)
|
|
struct usb_class_driver *class_driver)
|
|
{
|
|
{
|
|
- int minor_base = class_driver->minor_base;
|
|
|
|
- char name[20];
|
|
|
|
-
|
|
|
|
-#ifdef CONFIG_USB_DYNAMIC_MINORS
|
|
|
|
- minor_base = 0;
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
if (intf->minor == -1)
|
|
if (intf->minor == -1)
|
|
return;
|
|
return;
|
|
|
|
|
|
@@ -252,7 +245,6 @@ void usb_deregister_dev(struct usb_interface *intf,
|
|
usb_minors[intf->minor] = NULL;
|
|
usb_minors[intf->minor] = NULL;
|
|
up_write(&minor_rwsem);
|
|
up_write(&minor_rwsem);
|
|
|
|
|
|
- snprintf(name, sizeof(name), class_driver->name, intf->minor - minor_base);
|
|
|
|
device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));
|
|
device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));
|
|
intf->usb_dev = NULL;
|
|
intf->usb_dev = NULL;
|
|
intf->minor = -1;
|
|
intf->minor = -1;
|