* [PATCH v2] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h
@ 2015-02-17 2:32 Joseph Kogut
2015-02-17 3:54 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Joseph Kogut @ 2015-02-17 2:32 UTC (permalink / raw)
To: gregkh; +Cc: balbi, johnyoun, bhelgaas, linux-usb, linux-kernel, 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.
Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
---
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(-)
diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
index a4e724b..6646adb 100644
--- a/drivers/usb/dwc2/pci.c
+++ b/drivers/usb/dwc2/pci.c
@@ -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";
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 8d95056..b773fb5 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -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
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e63c02a..38cff8f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -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
--
2.3.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h
2015-02-17 2:32 [PATCH v2] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h Joseph Kogut
@ 2015-02-17 3:54 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2015-02-17 3:54 UTC (permalink / raw)
To: Joseph Kogut; +Cc: balbi, johnyoun, bhelgaas, linux-usb, linux-kernel
On Mon, Feb 16, 2015 at 07:32:46PM -0700, Joseph Kogut wrote:
> 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.
>
> Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-17 3:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-17 2:32 [PATCH v2] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h Joseph Kogut
2015-02-17 3:54 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox