| Message ID | 20241028025337.6372-2-ki.chiang65@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | xhci: Some improvement for Etron xHCI host | expand |
On 28.10.2024 4.53, Kuangyi Chiang wrote: > Combine two if statements, because these hosts have the same > quirk flags applied. > > Fixes: 91f7a1524a92 ("xhci: Apply broken streams quirk to Etron EJ188 xHCI host") > Cc: <stable@vger.kernel.org> > Signed-off-by: Kuangyi Chiang <ki.chiang65@gmail.com> Added to queue, but I removed the Fixes and stable tags as this is a small cleanup with no functional changes. > --- > drivers/usb/host/xhci-pci.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index 7e538194a0a4..33a6d99afc10 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c > @@ -395,12 +395,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) { > - 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_EJ168 || > + pdev->device == PCI_DEVICE_ID_EJ188)) { > xhci->quirks |= XHCI_RESET_ON_RESUME; > xhci->quirks |= XHCI_BROKEN_STREAMS; > }
Hi,
I noticed that one of the patches in your queue has a typo:
Commit 3456904e4bce ("xhci: pci: Use standard pattern for device IDs")
The Etron xHC device names are EJ168 and EJ188, not J168 and J188.
Thanks,
Kuangyi Chiang
Mathias Nyman <mathias.nyman@linux.intel.com> 於 2024年10月30日 週三 下午8:02寫道：
>
> On 28.10.2024 4.53, Kuangyi Chiang wrote:
> > Combine two if statements, because these hosts have the same
> > quirk flags applied.
> >
> > Fixes: 91f7a1524a92 ("xhci: Apply broken streams quirk to Etron EJ188 xHCI host")
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Kuangyi Chiang <ki.chiang65@gmail.com>
>
> Added to queue, but I removed the Fixes and stable tags as this is a small
> cleanup with no functional changes.
>
> > ---
> > drivers/usb/host/xhci-pci.c | 8 ++------
> > 1 file changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> > index 7e538194a0a4..33a6d99afc10 100644
> > --- a/drivers/usb/host/xhci-pci.c
> > +++ b/drivers/usb/host/xhci-pci.c
> > @@ -395,12 +395,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) {
> > - 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_EJ168 ||
> > + pdev->device == PCI_DEVICE_ID_EJ188)) {
> > xhci->quirks |= XHCI_RESET_ON_RESUME;
> > xhci->quirks |= XHCI_BROKEN_STREAMS;
> > }
>
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 7e538194a0a4..33a6d99afc10 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -395,12 +395,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) { - 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_EJ168 || + pdev->device == PCI_DEVICE_ID_EJ188)) { xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_BROKEN_STREAMS; }
Combine two if statements, because these hosts have the same quirk flags applied. Fixes: 91f7a1524a92 ("xhci: Apply broken streams quirk to Etron EJ188 xHCI host") Cc: <stable@vger.kernel.org> Signed-off-by: Kuangyi Chiang <ki.chiang65@gmail.com> --- drivers/usb/host/xhci-pci.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)