USB: usbmon: use simple_read_from_buffer()

[linux-2.6-omap-h63xx.git] / drivers / usb / mon / mon_main.c

diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index 8977ec0d0f9928218ada7a44fdb62cfd142aa072..442d8076b201d10284c1928fdaa1a3891f5ae027 100644 (file)
--- a/drivers/usb/mon/mon_main.c
+++ b/drivers/usb/mon/mon_main.c
@@ -129,7 +129,7 @@ static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error)
 
 /*
  */
-static void mon_bus_complete(struct mon_bus *mbus, struct urb *urb)
+static void mon_bus_complete(struct mon_bus *mbus, struct urb *urb, int status)
 {
        unsigned long flags;
        struct list_head *pos;
@@ -139,28 +139,18 @@ static void mon_bus_complete(struct mon_bus *mbus, struct urb *urb)
        mbus->cnt_events++;
        list_for_each (pos, &mbus->r_list) {
                r = list_entry(pos, struct mon_reader, r_link);
-               r->rnf_complete(r->r_data, urb);
+               r->rnf_complete(r->r_data, urb, status);
        }
        spin_unlock_irqrestore(&mbus->lock, flags);
 }
 
-static void mon_complete(struct usb_bus *ubus, struct urb *urb)
+static void mon_complete(struct usb_bus *ubus, struct urb *urb, int status)
 {
        struct mon_bus *mbus;
 
-       mbus = ubus->mon_bus;
-       if (mbus == NULL) {
-               /*
-                * This should not happen.
-                * At this point we do not even know the bus number...
-                */
-               printk(KERN_ERR TAG ": Null mon bus in URB, pipe 0x%x\n",
-                   urb->pipe);
-               return;
-       }
-
-       mon_bus_complete(mbus, urb);
-       mon_bus_complete(&mon_bus0, urb);
+       if ((mbus = ubus->mon_bus) != NULL)
+               mon_bus_complete(mbus, urb, status);
+       mon_bus_complete(&mon_bus0, urb, status);
 }
 
 /* int (*unlink_urb) (struct urb *urb, int status); */
@@ -170,7 +160,7 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb)
  */
 static void mon_stop(struct mon_bus *mbus)
 {
-       struct usb_bus *ubus = mbus->u_bus;
+       struct usb_bus *ubus;
        struct list_head *p;
 
        if (mbus == &mon_bus0) {
@@ -220,6 +210,8 @@ static void mon_bus_remove(struct usb_bus *ubus)
        list_del(&mbus->bus_link);
        if (mbus->text_inited)
                mon_text_del(mbus);
+       if (mbus->bin_inited)
+               mon_bin_del(mbus);
 
        mon_dissolve(mbus, ubus);
        kref_put(&mbus->ref, mon_bus_drop);
@@ -301,8 +293,8 @@ static void mon_bus_init(struct usb_bus *ubus)
        mbus->u_bus = ubus;
        ubus->mon_bus = mbus;
 
-       mbus->text_inited = mon_text_add(mbus, ubus->busnum);
-       // mon_bin_add(...)
+       mbus->text_inited = mon_text_add(mbus, ubus);
+       mbus->bin_inited = mon_bin_add(mbus, ubus);
 
        mutex_lock(&mon_lock);
        list_add_tail(&mbus->bus_link, &mon_buses);
@@ -321,8 +313,8 @@ static void mon_bus0_init(void)
        spin_lock_init(&mbus->lock);
        INIT_LIST_HEAD(&mbus->r_list);
 
-       mbus->text_inited = mon_text_add(mbus, 0);
-       // mbus->bin_inited = mon_bin_add(mbus, 0);
+       mbus->text_inited = mon_text_add(mbus, NULL);
+       mbus->bin_inited = mon_bin_add(mbus, NULL);
 }
 
 /*
@@ -403,6 +395,8 @@ static void __exit mon_exit(void)
 
                if (mbus->text_inited)
                        mon_text_del(mbus);
+               if (mbus->bin_inited)
+                       mon_bin_del(mbus);
 
                /*
                 * This never happens, because the open/close paths in
@@ -423,6 +417,8 @@ static void __exit mon_exit(void)
        mbus = &mon_bus0;
        if (mbus->text_inited)
                mon_text_del(mbus);
+       if (mbus->bin_inited)
+               mon_bin_del(mbus);
 
        mutex_unlock(&mon_lock);