diff options
Diffstat (limited to 'drivers/usb/host/pci-quirks.c')
-rw-r--r-- | drivers/usb/host/pci-quirks.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index c225159ca3d3..0ee694f043cc 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c | |||
@@ -190,9 +190,8 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev) | |||
190 | msleep(10); | 190 | msleep(10); |
191 | } | 191 | } |
192 | if (wait_time <= 0) | 192 | if (wait_time <= 0) |
193 | printk(KERN_WARNING "%s %s: BIOS handoff " | 193 | dev_warn(&pdev->dev, "OHCI: BIOS handoff failed" |
194 | "failed (BIOS bug ?) %08x\n", | 194 | " (BIOS bug?) %08x\n", |
195 | pdev->dev.bus_id, "OHCI", | ||
196 | readl(base + OHCI_CONTROL)); | 195 | readl(base + OHCI_CONTROL)); |
197 | 196 | ||
198 | /* reset controller, preserving RWC */ | 197 | /* reset controller, preserving RWC */ |
@@ -243,8 +242,7 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
243 | switch (cap & 0xff) { | 242 | switch (cap & 0xff) { |
244 | case 1: /* BIOS/SMM/... handoff support */ | 243 | case 1: /* BIOS/SMM/... handoff support */ |
245 | if ((cap & EHCI_USBLEGSUP_BIOS)) { | 244 | if ((cap & EHCI_USBLEGSUP_BIOS)) { |
246 | pr_debug("%s %s: BIOS handoff\n", | 245 | dev_dbg(&pdev->dev, "EHCI: BIOS handoff\n"); |
247 | pdev->dev.bus_id, "EHCI"); | ||
248 | 246 | ||
249 | #if 0 | 247 | #if 0 |
250 | /* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on, | 248 | /* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on, |
@@ -285,9 +283,8 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
285 | /* well, possibly buggy BIOS... try to shut | 283 | /* well, possibly buggy BIOS... try to shut |
286 | * it down, and hope nothing goes too wrong | 284 | * it down, and hope nothing goes too wrong |
287 | */ | 285 | */ |
288 | printk(KERN_WARNING "%s %s: BIOS handoff " | 286 | dev_warn(&pdev->dev, "EHCI: BIOS handoff failed" |
289 | "failed (BIOS bug ?) %08x\n", | 287 | " (BIOS bug?) %08x\n", cap); |
290 | pdev->dev.bus_id, "EHCI", cap); | ||
291 | pci_write_config_byte(pdev, offset + 2, 0); | 288 | pci_write_config_byte(pdev, offset + 2, 0); |
292 | } | 289 | } |
293 | 290 | ||
@@ -306,17 +303,14 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
306 | cap = 0; | 303 | cap = 0; |
307 | /* FALLTHROUGH */ | 304 | /* FALLTHROUGH */ |
308 | default: | 305 | default: |
309 | printk(KERN_WARNING "%s %s: unrecognized " | 306 | dev_warn(&pdev->dev, "EHCI: unrecognized capability " |
310 | "capability %02x\n", | 307 | "%02x\n", cap & 0xff); |
311 | pdev->dev.bus_id, "EHCI", | ||
312 | cap & 0xff); | ||
313 | break; | 308 | break; |
314 | } | 309 | } |
315 | offset = (cap >> 8) & 0xff; | 310 | offset = (cap >> 8) & 0xff; |
316 | } | 311 | } |
317 | if (!count) | 312 | if (!count) |
318 | printk(KERN_DEBUG "%s %s: capability loop?\n", | 313 | dev_printk(KERN_DEBUG, &pdev->dev, "EHCI: capability loop?\n"); |
319 | pdev->dev.bus_id, "EHCI"); | ||
320 | 314 | ||
321 | /* | 315 | /* |
322 | * halt EHCI & disable its interrupts in any case | 316 | * halt EHCI & disable its interrupts in any case |