diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 20:15:29 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-29 22:20:03 -0400 |
commit | fb28d58b72aa9215b26f1d5478462af394a4d253 (patch) | |
tree | 5452680dca9eab10d59d276e6b3cc53fab7a19a7 /drivers/usb/core/usb.c | |
parent | 70f3c7586c708bce8f525246c8b27322edc00cc7 (diff) |
USB: remove CONFIG_USB_DEVICEFS
This option has been deprecated for many years now, and no userspace
tools use it anymore, so it should be safe to finally remove it.
Reported-by: Kay Sievers <kay@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/usb.c')
-rw-r--r-- | drivers/usb/core/usb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index c74ba7bbc748..0ce862bfdd77 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -1030,9 +1030,6 @@ static int __init usb_init(void) | |||
1030 | retval = usb_devio_init(); | 1030 | retval = usb_devio_init(); |
1031 | if (retval) | 1031 | if (retval) |
1032 | goto usb_devio_init_failed; | 1032 | goto usb_devio_init_failed; |
1033 | retval = usbfs_init(); | ||
1034 | if (retval) | ||
1035 | goto fs_init_failed; | ||
1036 | retval = usb_hub_init(); | 1033 | retval = usb_hub_init(); |
1037 | if (retval) | 1034 | if (retval) |
1038 | goto hub_init_failed; | 1035 | goto hub_init_failed; |
@@ -1042,8 +1039,6 @@ static int __init usb_init(void) | |||
1042 | 1039 | ||
1043 | usb_hub_cleanup(); | 1040 | usb_hub_cleanup(); |
1044 | hub_init_failed: | 1041 | hub_init_failed: |
1045 | usbfs_cleanup(); | ||
1046 | fs_init_failed: | ||
1047 | usb_devio_cleanup(); | 1042 | usb_devio_cleanup(); |
1048 | usb_devio_init_failed: | 1043 | usb_devio_init_failed: |
1049 | usb_deregister(&usbfs_driver); | 1044 | usb_deregister(&usbfs_driver); |
@@ -1070,7 +1065,6 @@ static void __exit usb_exit(void) | |||
1070 | 1065 | ||
1071 | usb_deregister_device_driver(&usb_generic_driver); | 1066 | usb_deregister_device_driver(&usb_generic_driver); |
1072 | usb_major_cleanup(); | 1067 | usb_major_cleanup(); |
1073 | usbfs_cleanup(); | ||
1074 | usb_deregister(&usbfs_driver); | 1068 | usb_deregister(&usbfs_driver); |
1075 | usb_devio_cleanup(); | 1069 | usb_devio_cleanup(); |
1076 | usb_hub_cleanup(); | 1070 | usb_hub_cleanup(); |