Commit e307ff0f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

usb: host: pci_quirks: joing string literals

The patch joins the string literals for happy debugging. There is no functional
change.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 074f9dd5
...@@ -603,8 +603,8 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev) ...@@ -603,8 +603,8 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev)
msleep(10); msleep(10);
} }
if (wait_time <= 0) if (wait_time <= 0)
dev_warn(&pdev->dev, "OHCI: BIOS handoff failed" dev_warn(&pdev->dev,
" (BIOS bug?) %08x\n", "OHCI: BIOS handoff failed (BIOS bug?) %08x\n",
readl(base + OHCI_CONTROL)); readl(base + OHCI_CONTROL));
} }
#endif #endif
...@@ -733,8 +733,9 @@ static void ehci_bios_handoff(struct pci_dev *pdev, ...@@ -733,8 +733,9 @@ static void ehci_bios_handoff(struct pci_dev *pdev,
* and hope nothing goes too wrong * and hope nothing goes too wrong
*/ */
if (try_handoff) if (try_handoff)
dev_warn(&pdev->dev, "EHCI: BIOS handoff failed" dev_warn(&pdev->dev,
" (BIOS bug?) %08x\n", cap); "EHCI: BIOS handoff failed (BIOS bug?) %08x\n",
cap);
pci_write_config_byte(pdev, offset + 2, 0); pci_write_config_byte(pdev, offset + 2, 0);
} }
...@@ -781,8 +782,9 @@ static void quirk_usb_disable_ehci(struct pci_dev *pdev) ...@@ -781,8 +782,9 @@ static void quirk_usb_disable_ehci(struct pci_dev *pdev)
case 0: /* Illegal reserved cap, set cap=0 so we exit */ case 0: /* Illegal reserved cap, set cap=0 so we exit */
cap = 0; /* then fallthrough... */ cap = 0; /* then fallthrough... */
default: default:
dev_warn(&pdev->dev, "EHCI: unrecognized capability " dev_warn(&pdev->dev,
"%02x\n", cap & 0xff); "EHCI: unrecognized capability %02x\n",
cap & 0xff);
} }
offset = (cap >> 8) & 0xff; offset = (cap >> 8) & 0xff;
} }
...@@ -893,8 +895,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) ...@@ -893,8 +895,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
*/ */
if (!IS_ENABLED(CONFIG_USB_XHCI_HCD)) { if (!IS_ENABLED(CONFIG_USB_XHCI_HCD)) {
dev_warn(&xhci_pdev->dev, dev_warn(&xhci_pdev->dev,
"CONFIG_USB_XHCI_HCD is turned off, " "CONFIG_USB_XHCI_HCD is turned off, defaulting to EHCI.\n");
"defaulting to EHCI.\n");
dev_warn(&xhci_pdev->dev, dev_warn(&xhci_pdev->dev,
"USB 3.0 devices will work at USB 2.0 speeds.\n"); "USB 3.0 devices will work at USB 2.0 speeds.\n");
usb_disable_xhci_ports(xhci_pdev); usb_disable_xhci_ports(xhci_pdev);
...@@ -919,8 +920,9 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) ...@@ -919,8 +920,9 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN, pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,
&ports_available); &ports_available);
dev_dbg(&xhci_pdev->dev, "USB 3.0 ports that are now enabled " dev_dbg(&xhci_pdev->dev,
"under xHCI: 0x%x\n", ports_available); "USB 3.0 ports that are now enabled under xHCI: 0x%x\n",
ports_available);
/* Read XUSB2PRM, xHCI USB 2.0 Port Routing Mask Register /* Read XUSB2PRM, xHCI USB 2.0 Port Routing Mask Register
* Indicate the USB 2.0 ports to be controlled by the xHCI host. * Indicate the USB 2.0 ports to be controlled by the xHCI host.
...@@ -941,8 +943,9 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) ...@@ -941,8 +943,9 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR, pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,
&ports_available); &ports_available);
dev_dbg(&xhci_pdev->dev, "USB 2.0 ports that are now switched over " dev_dbg(&xhci_pdev->dev,
"to xHCI: 0x%x\n", ports_available); "USB 2.0 ports that are now switched over to xHCI: 0x%x\n",
ports_available);
} }
EXPORT_SYMBOL_GPL(usb_enable_intel_xhci_ports); EXPORT_SYMBOL_GPL(usb_enable_intel_xhci_ports);
...@@ -1010,8 +1013,9 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) ...@@ -1010,8 +1013,9 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
/* Assume a buggy BIOS and take HC ownership anyway */ /* Assume a buggy BIOS and take HC ownership anyway */
if (timeout) { if (timeout) {
dev_warn(&pdev->dev, "xHCI BIOS handoff failed" dev_warn(&pdev->dev,
" (BIOS bug ?) %08x\n", val); "xHCI BIOS handoff failed (BIOS bug ?) %08x\n",
val);
writel(val & ~XHCI_HC_BIOS_OWNED, base + ext_cap_offset); writel(val & ~XHCI_HC_BIOS_OWNED, base + ext_cap_offset);
} }
} }
...@@ -1039,8 +1043,8 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) ...@@ -1039,8 +1043,8 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
if (timeout) { if (timeout) {
val = readl(op_reg_base + XHCI_STS_OFFSET); val = readl(op_reg_base + XHCI_STS_OFFSET);
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"xHCI HW not ready after 5 sec (HC bug?) " "xHCI HW not ready after 5 sec (HC bug?) status = 0x%x\n",
"status = 0x%x\n", val); val);
} }
/* Send the halt and disable interrupts command */ /* Send the halt and disable interrupts command */
...@@ -1054,8 +1058,8 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) ...@@ -1054,8 +1058,8 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
if (timeout) { if (timeout) {
val = readl(op_reg_base + XHCI_STS_OFFSET); val = readl(op_reg_base + XHCI_STS_OFFSET);
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"xHCI HW did not halt within %d usec " "xHCI HW did not halt within %d usec status = 0x%x\n",
"status = 0x%x\n", XHCI_MAX_HALT_USEC, val); XHCI_MAX_HALT_USEC, val);
} }
iounmap(base); iounmap(base);
...@@ -1075,8 +1079,8 @@ static void quirk_usb_early_handoff(struct pci_dev *pdev) ...@@ -1075,8 +1079,8 @@ static void quirk_usb_early_handoff(struct pci_dev *pdev)
return; return;
if (pci_enable_device(pdev) < 0) { if (pci_enable_device(pdev) < 0) {
dev_warn(&pdev->dev, "Can't enable PCI device, " dev_warn(&pdev->dev,
"BIOS handoff failed.\n"); "Can't enable PCI device, BIOS handoff failed.\n");
return; return;
} }
if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI) if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI)
......
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