Commit 820d7a25 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: remove unused usb_host class

The usb_host class isn't used for anything anymore (it was used for
debug files, but they have moved to debugfs a few kernel releases ago),
so let's delete it before someone accidentally puts a file in it.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ed14f034
...@@ -755,23 +755,6 @@ static struct attribute_group usb_bus_attr_group = { ...@@ -755,23 +755,6 @@ static struct attribute_group usb_bus_attr_group = {
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static struct class *usb_host_class;
int usb_host_init(void)
{
int retval = 0;
usb_host_class = class_create(THIS_MODULE, "usb_host");
if (IS_ERR(usb_host_class))
retval = PTR_ERR(usb_host_class);
return retval;
}
void usb_host_cleanup(void)
{
class_destroy(usb_host_class);
}
/** /**
* usb_bus_init - shared initialization code * usb_bus_init - shared initialization code
* @bus: the bus structure being initialized * @bus: the bus structure being initialized
...@@ -818,12 +801,6 @@ static int usb_register_bus(struct usb_bus *bus) ...@@ -818,12 +801,6 @@ static int usb_register_bus(struct usb_bus *bus)
set_bit (busnum, busmap.busmap); set_bit (busnum, busmap.busmap);
bus->busnum = busnum; bus->busnum = busnum;
bus->dev = device_create(usb_host_class, bus->controller, MKDEV(0, 0),
bus, "usb_host%d", busnum);
result = PTR_ERR(bus->dev);
if (IS_ERR(bus->dev))
goto error_create_class_dev;
/* Add it to the local list of buses */ /* Add it to the local list of buses */
list_add (&bus->bus_list, &usb_bus_list); list_add (&bus->bus_list, &usb_bus_list);
mutex_unlock(&usb_bus_list_lock); mutex_unlock(&usb_bus_list_lock);
...@@ -834,8 +811,6 @@ static int usb_register_bus(struct usb_bus *bus) ...@@ -834,8 +811,6 @@ static int usb_register_bus(struct usb_bus *bus)
"number %d\n", bus->busnum); "number %d\n", bus->busnum);
return 0; return 0;
error_create_class_dev:
clear_bit(busnum, busmap.busmap);
error_find_busnum: error_find_busnum:
mutex_unlock(&usb_bus_list_lock); mutex_unlock(&usb_bus_list_lock);
return result; return result;
...@@ -865,8 +840,6 @@ static void usb_deregister_bus (struct usb_bus *bus) ...@@ -865,8 +840,6 @@ static void usb_deregister_bus (struct usb_bus *bus)
usb_notify_remove_bus(bus); usb_notify_remove_bus(bus);
clear_bit (bus->busnum, busmap.busmap); clear_bit (bus->busnum, busmap.busmap);
device_unregister(bus->dev);
} }
/** /**
......
...@@ -1055,9 +1055,6 @@ static int __init usb_init(void) ...@@ -1055,9 +1055,6 @@ static int __init usb_init(void)
retval = bus_register_notifier(&usb_bus_type, &usb_bus_nb); retval = bus_register_notifier(&usb_bus_type, &usb_bus_nb);
if (retval) if (retval)
goto bus_notifier_failed; goto bus_notifier_failed;
retval = usb_host_init();
if (retval)
goto host_init_failed;
retval = usb_major_init(); retval = usb_major_init();
if (retval) if (retval)
goto major_init_failed; goto major_init_failed;
...@@ -1087,8 +1084,6 @@ static int __init usb_init(void) ...@@ -1087,8 +1084,6 @@ static int __init usb_init(void)
driver_register_failed: driver_register_failed:
usb_major_cleanup(); usb_major_cleanup();
major_init_failed: major_init_failed:
usb_host_cleanup();
host_init_failed:
bus_unregister_notifier(&usb_bus_type, &usb_bus_nb); bus_unregister_notifier(&usb_bus_type, &usb_bus_nb);
bus_notifier_failed: bus_notifier_failed:
bus_unregister(&usb_bus_type); bus_unregister(&usb_bus_type);
...@@ -1113,7 +1108,6 @@ static void __exit usb_exit(void) ...@@ -1113,7 +1108,6 @@ static void __exit usb_exit(void)
usb_deregister(&usbfs_driver); usb_deregister(&usbfs_driver);
usb_devio_cleanup(); usb_devio_cleanup();
usb_hub_cleanup(); usb_hub_cleanup();
usb_host_cleanup();
bus_unregister_notifier(&usb_bus_type, &usb_bus_nb); bus_unregister_notifier(&usb_bus_type, &usb_bus_nb);
bus_unregister(&usb_bus_type); bus_unregister(&usb_bus_type);
ksuspend_usb_cleanup(); ksuspend_usb_cleanup();
......
...@@ -41,8 +41,6 @@ extern int usb_hub_init(void); ...@@ -41,8 +41,6 @@ extern int usb_hub_init(void);
extern void usb_hub_cleanup(void); extern void usb_hub_cleanup(void);
extern int usb_major_init(void); extern int usb_major_init(void);
extern void usb_major_cleanup(void); extern void usb_major_cleanup(void);
extern int usb_host_init(void);
extern void usb_host_cleanup(void);
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
...@@ -336,7 +336,6 @@ struct usb_bus { ...@@ -336,7 +336,6 @@ struct usb_bus {
#ifdef CONFIG_USB_DEVICEFS #ifdef CONFIG_USB_DEVICEFS
struct dentry *usbfs_dentry; /* usbfs dentry entry for the bus */ struct dentry *usbfs_dentry; /* usbfs dentry entry for the bus */
#endif #endif
struct device *dev; /* device for this bus */
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
struct mon_bus *mon_bus; /* non-null when associated */ struct mon_bus *mon_bus; /* non-null when associated */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment