Revert "usb: interface authorization: Introduces the USB interface authorization"

This reverts commit ef0909c50fe63be3f9aa09bdf4db7efaa5919be9 as the
signed-off-by address is invalid.

Cc: Stefan Koch <stefan.koch10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index c090f50af1021a363ca7207d83944c63a79f1db7..3d25d89671d71b772b2510b4147df1d6eb017ec0 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1555,44 +1555,6 @@ static void usb_release_interface(struct device *dev)
        kfree(intf);
 }
 
-/*
- * usb_deauthorize_interface - deauthorize an USB interface
- *
- * @intf: USB interface structure
- */
-void usb_deauthorize_interface(struct usb_interface *intf)
-{
-       struct device *dev = &intf->dev;
-
-       device_lock(dev->parent);
-
-       if (intf->authorized) {
-               device_lock(dev);
-               intf->authorized = 0;
-               device_unlock(dev);
-
-               usb_forced_unbind_intf(intf);
-       }
-
-       device_unlock(dev->parent);
-}
-
-/*
- * usb_authorize_interface - authorize an USB interface
- *
- * @intf: USB interface structure
- */
-void usb_authorize_interface(struct usb_interface *intf)
-{
-       struct device *dev = &intf->dev;
-
-       if (!intf->authorized) {
-               device_lock(dev);
-               intf->authorized = 1; /* authorize interface */
-               device_unlock(dev);
-       }
-}
-
 static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        struct usb_device *usb_dev;

diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 05b5e17abf92fc158530d13f3e2ae8edf9923c5a..457255a3306a3c2837674d22aa9560bf30842220 100644 (file)
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -27,8 +27,6 @@ extern void usb_release_interface_cache(struct kref *ref);
 extern void usb_disable_device(struct usb_device *dev, int skip_ep0);
 extern int usb_deauthorize_device(struct usb_device *);
 extern int usb_authorize_device(struct usb_device *);
-extern void usb_deauthorize_interface(struct usb_interface *);
-extern void usb_authorize_interface(struct usb_interface *);
 extern void usb_detect_quirks(struct usb_device *udev);
 extern void usb_detect_interface_quirks(struct usb_device *udev);
 extern int usb_remove_device(struct usb_device *udev);