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

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

drivers/usb/host/pci-quirks.c

+25 −21
Original line number Diff line number Diff line
@@ -603,8 +603,8 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev) 
			msleep(10);

		}

		if (wait_time <= 0)

			dev_warn(&pdev->dev, "OHCI: BIOS handoff failed"

					" (BIOS bug?) %08x\n",

			dev_warn(&pdev->dev,

				 "OHCI: BIOS handoff failed (BIOS bug?) %08x\n",

				 readl(base + OHCI_CONTROL));

	}

#endif
@@ -733,8 +733,9 @@ static void ehci_bios_handoff(struct pci_dev *pdev, 
		 * and hope nothing goes too wrong

		 */

		if (try_handoff)

			dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"

				 " (BIOS bug?) %08x\n", cap);

			dev_warn(&pdev->dev,

				 "EHCI: BIOS handoff failed (BIOS bug?) %08x\n",

				 cap);

		pci_write_config_byte(pdev, offset + 2, 0);

	}
@@ -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 */

			cap = 0; /* then fallthrough... */

		default:

			dev_warn(&pdev->dev, "EHCI: unrecognized capability "

				 "%02x\n", cap & 0xff);

			dev_warn(&pdev->dev,

				 "EHCI: unrecognized capability %02x\n",

				 cap & 0xff);

		}

		offset = (cap >> 8) & 0xff;

	}
@@ -893,8 +895,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) 
	 */

	if (!IS_ENABLED(CONFIG_USB_XHCI_HCD)) {

		dev_warn(&xhci_pdev->dev,

				"CONFIG_USB_XHCI_HCD is turned off, "

				"defaulting to EHCI.\n");

			 "CONFIG_USB_XHCI_HCD is turned off, defaulting to EHCI.\n");

		dev_warn(&xhci_pdev->dev,

				"USB 3.0 devices will work at USB 2.0 speeds.\n");

		usb_disable_xhci_ports(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,

			&ports_available);

	dev_dbg(&xhci_pdev->dev, "USB 3.0 ports that are now enabled "

			"under xHCI: 0x%x\n", ports_available);

	dev_dbg(&xhci_pdev->dev,

		"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

	 * 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) 


	pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,

			&ports_available);

	dev_dbg(&xhci_pdev->dev, "USB 2.0 ports that are now switched over "

			"to xHCI: 0x%x\n", ports_available);

	dev_dbg(&xhci_pdev->dev,

		"USB 2.0 ports that are now switched over to xHCI: 0x%x\n",

		ports_available);

}

EXPORT_SYMBOL_GPL(usb_enable_intel_xhci_ports);
@@ -1010,8 +1013,9 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) 


		/* Assume a buggy BIOS and take HC ownership anyway */

		if (timeout) {

			dev_warn(&pdev->dev, "xHCI BIOS handoff failed"

					" (BIOS bug ?) %08x\n", val);

			dev_warn(&pdev->dev,

				 "xHCI BIOS handoff failed (BIOS bug ?) %08x\n",

				 val);

			writel(val & ~XHCI_HC_BIOS_OWNED, base + ext_cap_offset);

		}

	}
@@ -1039,8 +1043,8 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) 
	if (timeout) {

		val = readl(op_reg_base + XHCI_STS_OFFSET);

		dev_warn(&pdev->dev,

				"xHCI HW not ready after 5 sec (HC bug?) "

				"status = 0x%x\n", val);

			 "xHCI HW not ready after 5 sec (HC bug?) status = 0x%x\n",

			 val);

	}



	/* Send the halt and disable interrupts command */
@@ -1054,8 +1058,8 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) 
	if (timeout) {

		val = readl(op_reg_base + XHCI_STS_OFFSET);

		dev_warn(&pdev->dev,

				"xHCI HW did not halt within %d usec "

				"status = 0x%x\n", XHCI_MAX_HALT_USEC, val);

			 "xHCI HW did not halt within %d usec status = 0x%x\n",

			 XHCI_MAX_HALT_USEC, val);

	}



	iounmap(base);
@@ -1075,8 +1079,8 @@ static void quirk_usb_early_handoff(struct pci_dev *pdev) 
		return;



	if (pci_enable_device(pdev) < 0) {

		dev_warn(&pdev->dev, "Can't enable PCI device, "

				"BIOS handoff failed.\n");

		dev_warn(&pdev->dev,

			 "Can't enable PCI device, BIOS handoff failed.\n");

		return;

	}

	if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI)