[PATCH v1 0/2] xhci: pci: Amend definitions of PCI device IDs

[PATCH v1 0/2] xhci: pci: Amend definitions of PCI device IDs

[Andy Shevchenko]

Amend the definitions of PCI device IDs.

Andy Shevchenko (2):
  xhci: pci: Use standard pattern for device IDs
  xhci: pci: Fix indentation in the PCI device ID definitions

 drivers/usb/host/xhci-pci.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

-- 
2.43.0.rc1.1336.g36b5255a03ac

[PATCH v1 1/2] xhci: pci: Use standard pattern for device IDs

[Andy Shevchenko]

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(-)

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;
 	}
-- 
2.43.0.rc1.1336.g36b5255a03ac

Re: [PATCH v1 1/2] xhci: pci: Use standard pattern for device IDs

[Sergei Shtylyov]

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

Re: [PATCH v1 1/2] xhci: pci: Use standard pattern for device IDs

[Andy Shevchenko]

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!

-- 
With Best Regards,
Andy Shevchenko

[PATCH v1 2/2] xhci: pci: Fix indentation in the PCI device ID definitions

[Andy Shevchenko]

Some of the definitions are missing the one TAB, add it to them.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/usb/host/xhci-pci.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 6d9eb2b031e2..cbbee5175547 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -28,8 +28,8 @@
 #define SPARSE_CNTL_ENABLE	0xC12C
 
 /* Device for a quirk */
-#define PCI_VENDOR_ID_FRESCO_LOGIC	0x1b73
-#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK	0x1000
+#define PCI_VENDOR_ID_FRESCO_LOGIC		0x1b73
+#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK		0x1000
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1009	0x1009
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1100	0x1100
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400	0x1400
@@ -38,8 +38,8 @@
 #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
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI		0x8c31
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI		0x9c31
 #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_XHCI	0x9cb1
 #define PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI		0x22b5
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI		0xa12f
-- 
2.43.0.rc1.1336.g36b5255a03ac