Skip to content

L
linux
Commit 8b1601ab authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

[PATCH] USB: drivers/usb/host/ fixups due to dev_printk change

parent 7309225c
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
drivers/usb/host/ehci-dbg.c
View file @ 8b1601ab
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,50) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,50)
#define ehci_dbg(ehci, fmt, args...) \ #define ehci_dbg(ehci, fmt, args...) \
dev_dbg (*(ehci)->hcd.controller, fmt, ## args ) dev_dbg ((ehci)->hcd.controller, fmt, ## args )
#define ehci_err(ehci, fmt, args...) \ #define ehci_err(ehci, fmt, args...) \
dev_err (*(ehci)->hcd.controller, fmt, ## args ) dev_err ((ehci)->hcd.controller, fmt, ## args )
#define ehci_info(ehci, fmt, args...) \ #define ehci_info(ehci, fmt, args...) \
dev_info (*(ehci)->hcd.controller, fmt, ## args ) dev_info ((ehci)->hcd.controller, fmt, ## args )
#define ehci_warn(ehci, fmt, args...) \ #define ehci_warn(ehci, fmt, args...) \
dev_warn (*(ehci)->hcd.controller, fmt, ## args ) dev_warn ((ehci)->hcd.controller, fmt, ## args )
#else #else
......
drivers/usb/host/ohci-dbg.c
View file @ 8b1601ab
...@@ -75,7 +75,7 @@ urb_print (struct urb * urb, char * str, int small) ...@@ -75,7 +75,7 @@ urb_print (struct urb * urb, char * str, int small)
static void ohci_dump_intr_mask (struct device *dev, char *label, __u32 mask) static void ohci_dump_intr_mask (struct device *dev, char *label, __u32 mask)
{ {
dev_dbg (*dev, "%s: 0x%08x%s%s%s%s%s%s%s%s%s\n", dev_dbg (dev, "%s: 0x%08x%s%s%s%s%s%s%s%s%s\n",
label, label,
mask, mask,
(mask & OHCI_INTR_MIE) ? " MIE" : "", (mask & OHCI_INTR_MIE) ? " MIE" : "",
...@@ -93,7 +93,7 @@ static void ohci_dump_intr_mask (struct device *dev, char *label, __u32 mask) ...@@ -93,7 +93,7 @@ static void ohci_dump_intr_mask (struct device *dev, char *label, __u32 mask)
static void maybe_print_eds (struct device *dev, char *label, __u32 value) static void maybe_print_eds (struct device *dev, char *label, __u32 value)
{ {
if (value) if (value)
dev_dbg (*dev, "%s %08x\n", label, value); dev_dbg (dev, "%s %08x\n", label, value);
} }
static char *hcfs2string (int state) static char *hcfs2string (int state)
...@@ -115,12 +115,12 @@ static void ohci_dump_status (struct ohci_hcd *controller) ...@@ -115,12 +115,12 @@ static void ohci_dump_status (struct ohci_hcd *controller)
__u32 temp; __u32 temp;
temp = readl (&regs->revision) & 0xff; temp = readl (&regs->revision) & 0xff;
dev_dbg (*dev, "OHCI %d.%d, %s legacy support registers\n", dev_dbg (dev, "OHCI %d.%d, %s legacy support registers\n",
0x03 & (temp >> 4), (temp & 0x0f), 0x03 & (temp >> 4), (temp & 0x0f),
(temp & 0x10) ? "with" : "NO"); (temp & 0x10) ? "with" : "NO");
temp = readl (&regs->control); temp = readl (&regs->control);
dev_dbg (*dev, "control: 0x%08x%s%s%s HCFS=%s%s%s%s%s CBSR=%d\n", temp, dev_dbg (dev, "control: 0x%08x%s%s%s HCFS=%s%s%s%s%s CBSR=%d\n", temp,
(temp & OHCI_CTRL_RWE) ? " RWE" : "", (temp & OHCI_CTRL_RWE) ? " RWE" : "",
(temp & OHCI_CTRL_RWC) ? " RWC" : "", (temp & OHCI_CTRL_RWC) ? " RWC" : "",
(temp & OHCI_CTRL_IR) ? " IR" : "", (temp & OHCI_CTRL_IR) ? " IR" : "",
...@@ -133,7 +133,7 @@ static void ohci_dump_status (struct ohci_hcd *controller) ...@@ -133,7 +133,7 @@ static void ohci_dump_status (struct ohci_hcd *controller)
); );
temp = readl (&regs->cmdstatus); temp = readl (&regs->cmdstatus);
dev_dbg (*dev, "cmdstatus: 0x%08x SOC=%d%s%s%s%s\n", temp, dev_dbg (dev, "cmdstatus: 0x%08x SOC=%d%s%s%s%s\n", temp,
(temp & OHCI_SOC) >> 16, (temp & OHCI_SOC) >> 16,
(temp & OHCI_OCR) ? " OCR" : "", (temp & OHCI_OCR) ? " OCR" : "",
(temp & OHCI_BLF) ? " BLF" : "", (temp & OHCI_BLF) ? " BLF" : "",
...@@ -167,7 +167,7 @@ static void ohci_dump_roothub (struct ohci_hcd *controller, int verbose) ...@@ -167,7 +167,7 @@ static void ohci_dump_roothub (struct ohci_hcd *controller, int verbose)
ndp = (temp & RH_A_NDP); ndp = (temp & RH_A_NDP);
if (verbose) { if (verbose) {
dev_dbg (*controller->hcd.controller, dev_dbg (controller->hcd.controller,
"roothub.a: %08x POTPGT=%d%s%s%s%s%s NDP=%d\n", temp, "roothub.a: %08x POTPGT=%d%s%s%s%s%s NDP=%d\n", temp,
((temp & RH_A_POTPGT) >> 24) & 0xff, ((temp & RH_A_POTPGT) >> 24) & 0xff,
(temp & RH_A_NOCP) ? " NOCP" : "", (temp & RH_A_NOCP) ? " NOCP" : "",
...@@ -178,14 +178,14 @@ static void ohci_dump_roothub (struct ohci_hcd *controller, int verbose) ...@@ -178,14 +178,14 @@ static void ohci_dump_roothub (struct ohci_hcd *controller, int verbose)
ndp ndp
); );
temp = roothub_b (controller); temp = roothub_b (controller);
dev_dbg (*controller->hcd.controller, dev_dbg (controller->hcd.controller,
"roothub.b: %08x PPCM=%04x DR=%04x\n", "roothub.b: %08x PPCM=%04x DR=%04x\n",
temp, temp,
(temp & RH_B_PPCM) >> 16, (temp & RH_B_PPCM) >> 16,
(temp & RH_B_DR) (temp & RH_B_DR)
); );
temp = roothub_status (controller); temp = roothub_status (controller);
dev_dbg (*controller->hcd.controller, dev_dbg (controller->hcd.controller,
"roothub.status: %08x%s%s%s%s%s%s\n", "roothub.status: %08x%s%s%s%s%s%s\n",
temp, temp,
(temp & RH_HS_CRWE) ? " CRWE" : "", (temp & RH_HS_CRWE) ? " CRWE" : "",
...@@ -205,13 +205,13 @@ static void ohci_dump_roothub (struct ohci_hcd *controller, int verbose) ...@@ -205,13 +205,13 @@ static void ohci_dump_roothub (struct ohci_hcd *controller, int verbose)
static void ohci_dump (struct ohci_hcd *controller, int verbose) static void ohci_dump (struct ohci_hcd *controller, int verbose)
{ {
dev_dbg (*controller->hcd.controller, dev_dbg (controller->hcd.controller,
"OHCI controller state\n"); "OHCI controller state\n");
// dumps some of the state we know about // dumps some of the state we know about
ohci_dump_status (controller); ohci_dump_status (controller);
if (controller->hcca) if (controller->hcca)
dev_dbg (*controller->hcd.controller, dev_dbg (controller->hcd.controller,
"hcca frame #%04x\n", controller->hcca->frame_no); "hcca frame #%04x\n", controller->hcca->frame_no);
ohci_dump_roothub (controller, 1); ohci_dump_roothub (controller, 1);
} }
...@@ -517,7 +517,7 @@ static inline void create_debug_files (struct ohci_hcd *bus) ...@@ -517,7 +517,7 @@ static inline void create_debug_files (struct ohci_hcd *bus)
device_create_file (bus->hcd.controller, &dev_attr_async); device_create_file (bus->hcd.controller, &dev_attr_async);
device_create_file (bus->hcd.controller, &dev_attr_periodic); device_create_file (bus->hcd.controller, &dev_attr_periodic);
// registers // registers
dev_dbg (*bus->hcd.controller, "created debug files\n"); dev_dbg (bus->hcd.controller, "created debug files\n");
} }
static inline void remove_debug_files (struct ohci_hcd *bus) static inline void remove_debug_files (struct ohci_hcd *bus)
......
drivers/usb/host/ohci-hcd.c
View file @ 8b1601ab
...@@ -383,7 +383,7 @@ static int hc_reset (struct ohci_hcd *ohci) ...@@ -383,7 +383,7 @@ static int hc_reset (struct ohci_hcd *ohci)
/* SMM owns the HC? not for long! */ /* SMM owns the HC? not for long! */
if (readl (&ohci->regs->control) & OHCI_CTRL_IR) { if (readl (&ohci->regs->control) & OHCI_CTRL_IR) {
dev_dbg (*ohci->hcd.controller, "USB HC TakeOver from BIOS/SMM\n"); dev_dbg (ohci->hcd.controller, "USB HC TakeOver from BIOS/SMM\n");
/* this timeout is arbitrary. we make it long, so systems /* this timeout is arbitrary. we make it long, so systems
* depending on usb keyboards may be usable even if the * depending on usb keyboards may be usable even if the
...@@ -396,7 +396,7 @@ static int hc_reset (struct ohci_hcd *ohci) ...@@ -396,7 +396,7 @@ static int hc_reset (struct ohci_hcd *ohci)
while (readl (&ohci->regs->control) & OHCI_CTRL_IR) { while (readl (&ohci->regs->control) & OHCI_CTRL_IR) {
wait_ms (10); wait_ms (10);
if (--temp == 0) { if (--temp == 0) {
dev_err (*ohci->hcd.controller, "USB HC TakeOver failed!\n"); dev_err (ohci->hcd.controller, "USB HC TakeOver failed!\n");
return -1; return -1;
} }
} }
...@@ -405,7 +405,7 @@ static int hc_reset (struct ohci_hcd *ohci) ...@@ -405,7 +405,7 @@ static int hc_reset (struct ohci_hcd *ohci)
/* Disable HC interrupts */ /* Disable HC interrupts */
writel (OHCI_INTR_MIE, &ohci->regs->intrdisable); writel (OHCI_INTR_MIE, &ohci->regs->intrdisable);
dev_dbg (*ohci->hcd.controller, "USB HC reset_hc %s: ctrl = 0x%x ;\n", dev_dbg (ohci->hcd.controller, "USB HC reset_hc %s: ctrl = 0x%x ;\n",
ohci->hcd.self.bus_name, ohci->hcd.self.bus_name,
readl (&ohci->regs->control)); readl (&ohci->regs->control));
...@@ -422,7 +422,7 @@ static int hc_reset (struct ohci_hcd *ohci) ...@@ -422,7 +422,7 @@ static int hc_reset (struct ohci_hcd *ohci)
temp = 30; /* ... allow extra time */ temp = 30; /* ... allow extra time */
while ((readl (&ohci->regs->cmdstatus) & OHCI_HCR) != 0) { while ((readl (&ohci->regs->cmdstatus) & OHCI_HCR) != 0) {
if (--temp == 0) { if (--temp == 0) {
dev_err (*ohci->hcd.controller, "USB HC reset timed out!"); dev_err (ohci->hcd.controller, "USB HC reset timed out!");
return -1; return -1;
} }
udelay (1); udelay (1);
...@@ -594,7 +594,7 @@ static void ohci_stop (struct usb_hcd *hcd) ...@@ -594,7 +594,7 @@ static void ohci_stop (struct usb_hcd *hcd)
{ {
struct ohci_hcd *ohci = hcd_to_ohci (hcd); struct ohci_hcd *ohci = hcd_to_ohci (hcd);
dev_dbg (*hcd->controller, "stop %s controller%s\n", dev_dbg (hcd->controller, "stop %s controller%s\n",
hcfs2string (ohci->hc_control & OHCI_CTRL_HCFS), hcfs2string (ohci->hc_control & OHCI_CTRL_HCFS),
ohci->disabled ? " (disabled)" : "" ohci->disabled ? " (disabled)" : ""
); );
......
drivers/usb/host/ohci-hub.c
View file @ 8b1601ab
...@@ -41,7 +41,7 @@ static u32 roothub_portstatus (struct ohci_hcd *hc, int i) ...@@ -41,7 +41,7 @@ static u32 roothub_portstatus (struct ohci_hcd *hc, int i)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#define dbg_port(hc,label,num,value) \ #define dbg_port(hc,label,num,value) \
dev_dbg (*hc->hcd.controller, \ dev_dbg (hc->hcd.controller, \
"%s roothub.portstatus [%d] " \ "%s roothub.portstatus [%d] " \
"= 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\n", \ "= 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\n", \
label, num, temp, \ label, num, temp, \
......
drivers/usb/host/ohci-mem.c
View file @ 8b1601ab
...@@ -122,7 +122,7 @@ td_free (struct ohci_hcd *hc, struct td *td) ...@@ -122,7 +122,7 @@ td_free (struct ohci_hcd *hc, struct td *td)
if (*prev) if (*prev)
*prev = td->td_hash; *prev = td->td_hash;
else else
dev_dbg (*hc->hcd.controller, "bad hash for td %p\n", td); dev_dbg (hc->hcd.controller, "bad hash for td %p\n", td);
pci_pool_free (hc->td_cache, td, td->td_dma); pci_pool_free (hc->td_cache, td, td->td_dma);
} }
......
drivers/usb/host/ohci-q.c
View file @ 8b1601ab
...@@ -206,7 +206,7 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed) ...@@ -206,7 +206,7 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
default: default:
branch = balance (ohci, ed->interval, ed->load); branch = balance (ohci, ed->interval, ed->load);
if (branch < 0) { if (branch < 0) {
dev_dbg (*ohci->hcd.controller, dev_dbg (ohci->hcd.controller,
"ERR %d, interval %d msecs, load %d\n", "ERR %d, interval %d msecs, load %d\n",
branch, ed->interval, ed->load); branch, ed->interval, ed->load);
// FIXME if there are TDs queued, fail them! // FIXME if there are TDs queued, fail them!
...@@ -786,7 +786,7 @@ ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev) ...@@ -786,7 +786,7 @@ ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev)
} }
/* help for troubleshooting: */ /* help for troubleshooting: */
dev_dbg (urb->dev->dev, dev_dbg (&urb->dev->dev,
"urb %p usb-%s-%s ep-%d-%s cc %d --> status %d\n", "urb %p usb-%s-%s ep-%d-%s cc %d --> status %d\n",
urb, urb,
urb->dev->bus->bus_name, urb->dev->devpath, urb->dev->bus->bus_name, urb->dev->devpath,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7