usb: dwc3: Moved PCI IDS to linux/pci_ids.h
Subsystems (3)
PATCH 1/1 usb: dwc3: Moved PCI IDS to linux/pci_ids.h
Moved DWC3 PCI IDS to linux/pci_ids.h per the FIXME.
--- drivers/usb/dwc3/dwc3-pci.c | 10 +--------- include/linux/pci_ids.h | 8 ++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/usb/dwc3/dwc3-pci.c +1 -9
@@ -20,19 +20,11 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/pci.h> +#include <linux/pci_ids.h> #include <linux/platform_device.h> #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 -#define PCI_DEVICE_ID_INTEL_BSW 0x22B7 -#define PCI_DEVICE_ID_INTEL_SPTLP 0x9d30 -#define PCI_DEVICE_ID_INTEL_SPTH 0xa130 -static int dwc3_pci_quirks (struct pci_dev *pdev) { if (pdev->vendor == PCI_VENDOR_ID_AMD &&
include/linux/pci_ids.h +8 -0
@@ -2312,6 +2312,9 @@#define PCI_VENDOR_ID_NETCELL 0x169c#define PCI_DEVICE_ID_REVOLUTION 0x0044 +#define PCI_VENDOR_ID_SYNOPSYS 0x16c3 +#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd +#define PCI_VENDOR_ID_CENATEK 0x16CA#define PCI_DEVICE_ID_CENATEK_IDE 0x0001
@@ -2566,12 +2569,14 @@#define PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB 0x095E#define PCI_DEVICE_ID_INTEL_I960 0x0960#define PCI_DEVICE_ID_INTEL_I960RM 0x0962 +#define PCI_DEVICE_ID_INTEL_BYT 0x0f37#define PCI_DEVICE_ID_INTEL_CENTERTON_ILB 0x0c60#define PCI_DEVICE_ID_INTEL_8257X_SOL 0x1062#define PCI_DEVICE_ID_INTEL_82573E_SOL 0x1085#define PCI_DEVICE_ID_INTEL_82573L_SOL 0x108F#define PCI_DEVICE_ID_INTEL_82815_MC 0x1130#define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 +#define PCI_DEVICE_ID_INTEL_MRFLD 0x119e#define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221#define PCI_DEVICE_ID_INTEL_7505_0 0x2550#define PCI_DEVICE_ID_INTEL_7205_0 0x255d
@@ -2593,6 +2598,7 @@#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI 0x1e31#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN 0x1e40#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX 0x1e5f +#define PCI_DEVICE_ID_INTEL_BSW 0x22B7#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f#define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
@@ -2891,6 +2897,8 @@#define PCI_DEVICE_ID_INTEL_84460GX 0x84ea#define PCI_DEVICE_ID_INTEL_IXP4XX 0x8500#define PCI_DEVICE_ID_INTEL_IXP2800 0x9004 +#define PCI_DEVICE_ID_INTEL_SPTLP 0x9d30 +#define PCI_DEVICE_ID_INTEL_SPTH 0xa130#define PCI_DEVICE_ID_INTEL_S21152BB 0xb152#define PCI_VENDOR_ID_SCALEMP 0x8686
Signature · 1 line
2.3.0
Bjorn Helgaas
maintainerQuoted 19 lines · Joseph Kogut
Moved DWC3 PCI IDS to
linux/pci_ids.hper the FIXME.Signed-off-by Joseph Kogut <[email protected]>--- drivers/usb/dwc3/dwc3-pci.c | 10 +--------- include/linux/pci_ids.h | 8 ++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)drivers/usb/dwc3/dwc3-pci.c +1
-0@@ -20,19 +20,11 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/pci.h> +#include <linux/pci_ids.h> #include <linux/platform_device.h>
drivers/usb/dwc3/dwc3-pci.c line 34
Quoted 10 lines
drivers/usb/dwc3/dwc3-pci.c +0
-8#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 -#define PCI_DEVICE_ID_INTEL_BSW 0x22B7 -#define PCI_DEVICE_ID_INTEL_SPTLP 0x9d30 -#define PCI_DEVICE_ID_INTEL_SPTH 0xa130
It looks like these constants are used only in this file. If that's the case, the comment at the top of pci_ids.h applies, the definitions can stay here, and you can just remove the "FIXME" comment.
Quoted 52 lines
drivers/usb/dwc3/dwc3-pci.c +0
-0static int dwc3_pci_quirks (struct pci_dev *pdev) { if (pdev->vendor == PCI_VENDOR_ID_AMD &&include/linux/pci_ids.h +8
-1@@ -2312,6 +2312,9 @@#define PCI_VENDOR_ID_NETCELL 0x169c#define PCI_DEVICE_ID_REVOLUTION 0x0044 +#define PCI_VENDOR_ID_SYNOPSYS 0x16c3 +#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd +#define PCI_VENDOR_ID_CENATEK 0x16CA#define PCI_DEVICE_ID_CENATEK_IDE 0x0001@@ -2566,12 +2569,14 @@#define PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB 0x095E#define PCI_DEVICE_ID_INTEL_I960 0x0960#define PCI_DEVICE_ID_INTEL_I960RM 0x0962 +#define PCI_DEVICE_ID_INTEL_BYT 0x0f37#define PCI_DEVICE_ID_INTEL_CENTERTON_ILB 0x0c60#define PCI_DEVICE_ID_INTEL_8257X_SOL 0x1062#define PCI_DEVICE_ID_INTEL_82573E_SOL 0x1085#define PCI_DEVICE_ID_INTEL_82573L_SOL 0x108F#define PCI_DEVICE_ID_INTEL_82815_MC 0x1130#define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 +#define PCI_DEVICE_ID_INTEL_MRFLD 0x119e#define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221#define PCI_DEVICE_ID_INTEL_7505_0 0x2550#define PCI_DEVICE_ID_INTEL_7205_0 0x255d@@ -2593,6 +2598,7 @@#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI 0x1e31#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN 0x1e40#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX 0x1e5f +#define PCI_DEVICE_ID_INTEL_BSW 0x22B7#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX 0x231f#define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410@@ -2891,6 +2897,8 @@#define PCI_DEVICE_ID_INTEL_84460GX 0x84ea#define PCI_DEVICE_ID_INTEL_IXP4XX 0x8500#define PCI_DEVICE_ID_INTEL_IXP2800 0x9004 +#define PCI_DEVICE_ID_INTEL_SPTLP 0x9d30 +#define PCI_DEVICE_ID_INTEL_SPTH 0xa130#define PCI_DEVICE_ID_INTEL_S21152BB 0xb152#define PCI_VENDOR_ID_SCALEMP 0x8686 --2.3.0
It seems that the Synopsys vendor ID is used in usb/dwc2 as well, and the rest of the definitions aren't referenced outside of usb/dwc3. Would the proper approach be to move the Synopsys vendor ID to linux/pci_ids.h, remove the redefinition in usb/dwc2, and remove the fixme?
Greg Kroah-Hartman
maintainerQuoted 5 lines · Joseph Kogut
It seems that the Synopsys vendor ID is used in usb/dwc2 as well, and the rest of the definitions aren't referenced outside of usb/dwc3. Would the proper approach be to move the Synopsys vendor ID to
linux/pci_ids.h, remove the redefinition in usb/dwc2, and remove the fixme?
That sounds like the "correct" fix for this.