Re: [PATCH] usb: dwc3: Moved PCI IDS to linux/pci_ids.h

[Bjorn Helgaas]

On Sun, Feb 15, 2015 at 6:17 PM, Joseph Kogut <joseph.kogut@xxxxxxxxx> wrote:
> Moved DWC3 PCI IDS to linux/pci_ids.h per the FIXME.
>
> Signed-off-by: Joseph Kogut <joseph.kogut@xxxxxxxxx>
> ---
>  drivers/usb/dwc3/dwc3-pci.c | 10 +---------
>  include/linux/pci_ids.h     |  8 ++++++++
>  2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> index 8d95056..19ca7f6 100644
> --- a/drivers/usb/dwc3/dwc3-pci.c
> +++ b/drivers/usb/dwc3/dwc3-pci.c
> @@ -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

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.

>  static int dwc3_pci_quirks(struct pci_dev *pdev)
>  {
>         if (pdev->vendor == PCI_VENDOR_ID_AMD &&
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index e63c02a..6fc5cdd 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/