[PATCH] USB: convert usbmon to use usb notifiers

This also removes 2 usbmon callbacks.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 0 insertions, 18 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 16790ad0e2e4..e8f2b8d8f14d 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -793,7 +793,6 @@ static int usb_register_bus(struct usb_bus *bus)
         up (&usb_bus_list_lock);
 
         usb_notify_add_bus(bus);
-        usbmon_notify_bus_add (bus);
 
         dev_info (bus->controller, "new USB bus registered, assigned bus number %d\n", bus->busnum);
         return 0;
@@ -821,7 +820,6 @@ static void usb_deregister_bus (struct usb_bus *bus)
         up (&usb_bus_list_lock);
 
         usb_notify_remove_bus(bus);
-        usbmon_notify_bus_remove (bus);
 
         clear_bit (bus->busnum, busmap.busmap);
 
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index cc33886260cd..a5d92943ff95 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -421,8 +421,6 @@ struct usb_mon_operations {
         void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
         void (*urb_complete)(struct usb_bus *bus, struct urb *urb);
         /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
-        void (*bus_add)(struct usb_bus *bus);
-        void (*bus_remove)(struct usb_bus *bus);
 };
 
 extern struct usb_mon_operations *mon_ops;
@@ -445,18 +443,6 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb)
         if (bus->monitored)
                 (*mon_ops->urb_complete)(bus, urb);
 }
- 
-static inline void usbmon_notify_bus_add(struct usb_bus *bus)
-{
-        if (mon_ops)
-                (*mon_ops->bus_add)(bus);
-}
-
-static inline void usbmon_notify_bus_remove(struct usb_bus *bus)
-{
-        if (mon_ops)
-                (*mon_ops->bus_remove)(bus);
-}
 
 int usb_mon_register(struct usb_mon_operations *ops);
 void usb_mon_deregister(void);
@@ -467,8 +453,6 @@ static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb) {}
 static inline void usbmon_urb_submit_error(struct usb_bus *bus, struct urb *urb,
     int error) {}
 static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb) {}
-static inline void usbmon_notify_bus_add(struct usb_bus *bus) {}
-static inline void usbmon_notify_bus_remove(struct usb_bus *bus) {}
 
 #endif /* CONFIG_USB_MON */