On 9/13/24 11:43 AM, Andy Shevchenko wrote: > The definitions of vendor IDs are follow the pattern s/are//? > 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@xxxxxxxxxxxxxxx> [...] > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index de50f5ba60df..6d9eb2b031e2 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c [...] > @@ -388,12 +388,12 @@ 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_ETRON_EJ168) { > xhci->quirks |= XHCI_RESET_ON_RESUME; > xhci->quirks |= XHCI_BROKEN_STREAMS; > } > if (pdev->vendor == PCI_VENDOR_ID_ETRON && > - pdev->device == PCI_DEVICE_ID_EJ188) { > + pdev->device == PCI_DEVICE_ID_ETRON_EJ188) { > xhci->quirks |= XHCI_RESET_ON_RESUME; > xhci->quirks |= XHCI_BROKEN_STREAMS; > Hm, these 2 *if*s seem mergeable? MBR, Sergey