[PATCH usb-next] usb: xhci-pci: Cleanup xhci_pci_setup() for shared HCD

[Michal Pecio <michal.pecio@gmail.com>]

This function will be called again when/if the shared HCD is added.
Little to do in this case and there is no need to set some de-facto
read-only properties of the xhci again, even if it was harmless.

Don't bother passing the unused xhci_pci_quirks in this case either.

Signed-off-by: Michal Pecio <michal.pecio@gmail.com>
---

This is an alternative to the cleanup discussed last week, which
doesn't require a v2 bugfix. But I also have a v2 bugfix ready if
you think the original option was better.

Both variants were tested with and without "fake USB2-only" patch.

The idea here is that there will hopefully never be anything PCI
specific to do with the shared HCD, so make it patently clear.

It is actually more likely that xhci_gen_setup() might try to use
allow_single_roothub or imod_interval, in which case this version
avoids creating another surprise like the one last week.

 drivers/usb/host/xhci-pci.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index cb7f5dd34333..e09f5fb52cf3 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -568,7 +568,7 @@ static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
 static void xhci_find_lpm_incapable_ports(struct usb_hcd *hcd, struct usb_device *hdev) { }
 #endif /* CONFIG_ACPI */
 
-/* called during probe() after chip reset completes */
+/* called during probe() after chip reset completes and again on the shared HCD */
 static int xhci_pci_setup(struct usb_hcd *hcd)
 {
 	struct xhci_hcd		*xhci;
@@ -576,6 +576,10 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
 	int			retval;
 	u8			sbrn;
 
+	/* nothing PCI-specific for the shared HCD, just core setup, no quirks */
+	if (!usb_hcd_is_primary_hcd(hcd))
+		return xhci_gen_setup(hcd, NULL);
+
 	xhci = hcd_to_xhci(hcd);
 
 	/* imod_interval is the interrupt moderation value in nanoseconds. */
@@ -586,9 +590,6 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
 	if (retval)
 		return retval;
 
-	if (!usb_hcd_is_primary_hcd(hcd))
-		return 0;
-
 	if (xhci->quirks & XHCI_PME_STUCK_QUIRK)
 		xhci_pme_acpi_rtd3_enable(pdev);
 
-- 
2.48.1