aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/hcd.h
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2007-08-24 15:41:41 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 17:55:23 -0400
commit9347d51c52afcf1a77d2104f162cf8a085624c83 (patch)
treef128a00eeed69166f5f5a7196a8c1c45c5cc5d92 /drivers/usb/core/hcd.h
parent888fda47051716765175d0008450126c837adb32 (diff)
USB: reorganize urb->status use in usbmon
This patch (as978) reorganizes the way usbmon uses urb->status. It now accepts the status value as an argument. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/hcd.h')
-rw-r--r--drivers/usb/core/hcd.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 745be2566f6..729b7a03acd 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -413,7 +413,7 @@ static inline void usbfs_cleanup(void) { }
413struct usb_mon_operations { 413struct usb_mon_operations {
414 void (*urb_submit)(struct usb_bus *bus, struct urb *urb); 414 void (*urb_submit)(struct usb_bus *bus, struct urb *urb);
415 void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err); 415 void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
416 void (*urb_complete)(struct usb_bus *bus, struct urb *urb); 416 void (*urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
417 /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */ 417 /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
418}; 418};
419 419
@@ -432,10 +432,11 @@ static inline void usbmon_urb_submit_error(struct usb_bus *bus, struct urb *urb,
432 (*mon_ops->urb_submit_error)(bus, urb, error); 432 (*mon_ops->urb_submit_error)(bus, urb, error);
433} 433}
434 434
435static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb) 435static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
436 int status)
436{ 437{
437 if (bus->monitored) 438 if (bus->monitored)
438 (*mon_ops->urb_complete)(bus, urb); 439 (*mon_ops->urb_complete)(bus, urb, status);
439} 440}
440 441
441int usb_mon_register(struct usb_mon_operations *ops); 442int usb_mon_register(struct usb_mon_operations *ops);
@@ -446,7 +447,8 @@ void usb_mon_deregister(void);
446static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb) {} 447static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb) {}
447static inline void usbmon_urb_submit_error(struct usb_bus *bus, struct urb *urb, 448static inline void usbmon_urb_submit_error(struct usb_bus *bus, struct urb *urb,
448 int error) {} 449 int error) {}
449static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb) {} 450static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
451 int status) {}
450 452
451#endif /* CONFIG_USB_MON */ 453#endif /* CONFIG_USB_MON */
452 454