xhci: pci: Use standard pattern for device IDs

The definitions of vendor IDs follow the pattern PCI_VENDOR_ID_#vendor,
while device IDs — PCI_DEVICE_ID_#vendor_#device.

Update the ETRON device IDs to follow the above mentioned pattern.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20241106101459.775897-22-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 0d49d9c390c1d573ddf10504deecc851d0a86982..77f9fe7a7dcd019d13b5fcdaae5c4fb7bcf8527a 100644 (file)
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -34,9 +34,9 @@
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1100      0x1100
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400      0x1400
 
-#define PCI_VENDOR_ID_ETRON            0x1b6f
-#define PCI_DEVICE_ID_EJ168            0x7023
-#define PCI_DEVICE_ID_EJ188            0x7052
+#define PCI_VENDOR_ID_ETRON                    0x1b6f
+#define PCI_DEVICE_ID_ETRON_EJ168              0x7023
+#define PCI_DEVICE_ID_ETRON_EJ188              0x7052
 
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI     0x8c31
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI  0x9c31
@@ -394,8 +394,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
                xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
 
        if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
-           (pdev->device == PCI_DEVICE_ID_EJ168 ||
-            pdev->device == PCI_DEVICE_ID_EJ188)) {
+           (pdev->device == PCI_DEVICE_ID_ETRON_EJ168 ||
+            pdev->device == PCI_DEVICE_ID_ETRON_EJ188)) {
                xhci->quirks |= XHCI_ETRON_HOST;
                xhci->quirks |= XHCI_RESET_ON_RESUME;
                xhci->quirks |= XHCI_BROKEN_STREAMS;