Skip to contentSkip to conversation

usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

PATCH Superseded Joseph Kogut 3 participants 6 messages Feb 17, 2015

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

---
 drivers/usb/dwc2/pci.c      | 1 -
 drivers/usb/dwc3/dwc3-pci.c | 2 --
 include/linux/pci_ids.h     | 2 ++
 3 files changed, 2 insertions(+), 3 deletions(-)
drivers/usb/dwc2/pci.c +0 -1
index a4e724b..6646adb 100644
@@ -54,7 +54,6 @@
 #include "core.h"
 #include "hcd.h"
 
-#define PCI_VENDOR_ID_SYNOPSYS		0x16c3
 #define PCI_PRODUCT_ID_HAPS_HSOTG	0xabc0
 
 static const char dwc2_driver_name[] = "dwc2";
drivers/usb/dwc3/dwc3-pci.c +0 -2
index 8d95056..b773fb5 100644
@@ -24,8 +24,6 @@
 
 #include "platform_data.h"
 
-/* FIXME define these in <linux/pci_ids.h> */
-#define PCI_VENDOR_ID_SYNOPSYS		0x16c3
 #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3	0xabcd
 #define PCI_DEVICE_ID_INTEL_BYT		0x0f37
 #define PCI_DEVICE_ID_INTEL_MRFLD	0x119e
include/linux/pci_ids.h +2 -0
index e63c02a..38cff8f 100644
@@ -2315,6 +2315,8 @@
 #define PCI_VENDOR_ID_CENATEK		0x16CA
 #define PCI_DEVICE_ID_CENATEK_IDE	0x0001
 
+#define PCI_VENDOR_ID_SYNOPSYS		0x16c3
+
 #define PCI_VENDOR_ID_VITESSE		0x1725
 #define PCI_DEVICE_ID_VITESSE_VSC7174	0x7174
 
Signature · 1 line
2.3.0
maintainer
#3 lore raw
Quoted 8 lines · Joseph Kogut
Quoted 5 lines · Greg KH
Quoted 1 line · Joseph Kogut

You need a changelog description here please.

Should I reply inline, or is resending the patch okay?

Do a 'v2' version of the patch, we can't apply inline changes :)

thanks,

greg k-h

#4 lore raw
In reply to Joseph Kogut

Hello.

Quoted 1 line · Joseph Kogut

[...]

include/linux/pci_ids.h line 2318

Quoted 9 lines
include/linux/pci_ids.h +1 -0
index e63c02a..38cff8f 100644
@@ -2315,6 +2315,8 @@
  #define PCI_VENDOR_ID_CENATEK		0x16CA
  #define PCI_DEVICE_ID_CENATEK_IDE	0x0001
 
+#define PCI_VENDOR_ID_SYNOPSYS		0x16c3

0x16c3 goes before 0x16ca. And the file seems to use uppercase for hex
numbers...

[...]

WBR, Sergei

#5 lore raw
Quoted 12 lines · Sergei Shtylyov
Quoted 1 line

[...]

Quoted 8 lines
include/linux/pci_ids.h +0 -0
index e63c02a..38cff8f 100644
@@ -2315,6 +2315,8 @@
  #define PCI_VENDOR_ID_CENATEK        0x16CA
  #define PCI_DEVICE_ID_CENATEK_IDE    0x0001
 
Quoted 4 lines

include/linux/pci_ids.h line 2318

Quoted 1 line
include/linux/pci_ids.h +1 -0
+#define PCI_VENDOR_ID_SYNOPSYS        0x16c3
    0x16c3 goes before 0x16ca. And the file seems to use uppercase for hex

numbers...

Actually no, it's only Cenatek ID that uses upper case, so disregard the
second comment.

Quoted 1 line

[...]

WBR, Sergei