Skip to contentSkip to conversation

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

PATCH In review Joseph Kogut 2 participants 2 messages Feb 17, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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

Removed FIXME from usb/dwc3/dwc3-pci.c by moving definition of PCI_VENDOR_ID_SYNOPSYS shared with usb/dwc2 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
#1 lore raw
Quoted 9 lines · Joseph Kogut

Removed FIXME from usb/dwc3/dwc3-pci.c by moving definition of PCI_VENDOR_ID_SYNOPSYS shared with usb/dwc2 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(-)

Felipe will take this through his tree when it opens back up again in a few weeks.

thanks,

greg k-h