| Message ID | 20240913084411.3309911-2-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xhci: pci: Amend definitions of PCI device IDs | expand |
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@linux.intel.com> [...] > 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
On Fri, Sep 13, 2024 at 11:51:48AM +0300, Sergei Shtylyov wrote: > On 9/13/24 11:43 AM, Andy Shevchenko wrote: > > > The definitions of vendor IDs are follow the pattern > > s/are//? Yeah, thank you for catching this. > > PCI_VENDOR_ID_#vendor, while device IDs — PCI_DEVICE_ID_#vendor_#device. > > > > Update the ETRON device IDs to follow the above mentioned pattern. [...] > > 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? It's out of the scope of this mini-series, but seems a good catch!
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 @@ -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 @@ -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; }
The definitions of vendor IDs are 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> --- drivers/usb/host/xhci-pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)