Commit f28a7d7d authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: Cleanup Candence controller PCI device and vendor ID usage 



Use predefined PCI vendor ID constant for Cadence controller in pci_ids.h
Rename the Candence device ID to match the pattern other PCI vendor and
device IDs use

Reported-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Closes: https://lore.kernel.org/linux-usb/ZuMOfHp9j_6_3-WC@surfacebook.localdomain


Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20241106101459.775897-5-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae71f9b8

drivers/usb/host/xhci-pci.c

+3 −5
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ 
#define PCI_DEVICE_ID_ASMEDIA_3042_XHCI			0x3042

#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI			0x3242



#define PCI_DEVICE_ID_CADENCE				0x17CD

#define PCI_DEVICE_ID_CADENCE_SSP			0x0200

#define PCI_DEVICE_ID_CDNS_SSP				0x0200



static const char hcd_name[] = "xhci_hcd";
@@ -481,9 +480,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		if (pdev->device == 0x9203)

			xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH;

	}



	if (pdev->vendor == PCI_DEVICE_ID_CADENCE &&

	    pdev->device == PCI_DEVICE_ID_CADENCE_SSP)

	if (pdev->vendor == PCI_VENDOR_ID_CDNS &&

	    pdev->device == PCI_DEVICE_ID_CDNS_SSP)

		xhci->quirks |= XHCI_CDNS_SCTX_QUIRK;



	/* xHC spec requires PCI devices to support D3hot and D3cold */