Commit b2e723de authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

[PATCH] USB: Use driver-model logging in the UHCI driver

The main item in this patch is the conversion of the UHCI driver from
using the old usb.h logging macros to the new driver-model dev_xxx
macros.

There are a few other minor changes too: updated version number, author,
copyright, and maintainer information, removed some unneeded error
messages, added some line breaks, added a convenience macro for the device
pointer.
parent 254a79b9
This diff is collapsed.
...@@ -315,6 +315,7 @@ enum uhci_state { ...@@ -315,6 +315,7 @@ enum uhci_state {
}; };
#define hcd_to_uhci(hcd_ptr) container_of(hcd_ptr, struct uhci_hcd, hcd) #define hcd_to_uhci(hcd_ptr) container_of(hcd_ptr, struct uhci_hcd, hcd)
#define uhci_dev(u) ((u)->hcd.self.controller)
/* /*
* This describes the full uhci information. * This describes the full uhci information.
...@@ -422,4 +423,3 @@ struct urb_priv { ...@@ -422,4 +423,3 @@ struct urb_priv {
*/ */
#endif #endif
/* /*
* Universal Host Controller Interface driver for USB. * Universal Host Controller Interface driver for USB.
* *
* Maintainer: Johannes Erdfelt <johannes@erdfelt.com> * Maintainer: Alan Stern <stern@rowland.harvard.edu>
* *
* (C) Copyright 1999 Linus Torvalds * (C) Copyright 1999 Linus Torvalds
* (C) Copyright 1999-2002 Johannes Erdfelt, johannes@erdfelt.com * (C) Copyright 1999-2002 Johannes Erdfelt, johannes@erdfelt.com
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* (C) Copyright 1999 Georg Acher, acher@in.tum.de * (C) Copyright 1999 Georg Acher, acher@in.tum.de
* (C) Copyright 1999 Deti Fliegl, deti@fliegl.de * (C) Copyright 1999 Deti Fliegl, deti@fliegl.de
* (C) Copyright 1999 Thomas Sailer, sailer@ife.ee.ethz.ch * (C) Copyright 1999 Thomas Sailer, sailer@ife.ee.ethz.ch
* (C) Copyright 2004 Alan Stern, stern@rowland.harvard.edu
*/ */
static __u8 root_hub_hub_des[] = static __u8 root_hub_hub_des[] =
...@@ -122,8 +123,7 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, ...@@ -122,8 +123,7 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
wPortStatus |= 1 << USB_PORT_FEAT_LOWSPEED; wPortStatus |= 1 << USB_PORT_FEAT_LOWSPEED;
if (wPortChange) if (wPortChange)
dev_dbg (uhci->hcd.self.controller, dev_dbg(uhci_dev(uhci), "port %d portsc %04x\n",
"port %d portsc %04x\n",
wIndex, status); wIndex, status);
*(__u16 *)buf = cpu_to_le16(wPortStatus); *(__u16 *)buf = cpu_to_le16(wPortStatus);
...@@ -209,4 +209,3 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, ...@@ -209,4 +209,3 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
return retval; return retval;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment