| Message ID | 1594195170-11119-1-git-send-email-chenhc@lemote.com |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: Move PCI_VENDOR_ID_REDHAT definition to pci_ids.h | expand |
On Wed, Jul 08, 2020 at 03:59:30PM +0800, Huacai Chen wrote: > Instead of duplicating the PCI_VENDOR_ID_REDHAT definition everywhere, > move it to include/linux/pci_ids.h is better. > > Signed-off-by: Huacai Chen <chenhc@lemote.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
[+cc Kirti, Alex, kvm] On Wed, Jul 08, 2020 at 03:59:30PM +0800, Huacai Chen wrote: > Instead of duplicating the PCI_VENDOR_ID_REDHAT definition everywhere, > move it to include/linux/pci_ids.h is better. > > Signed-off-by: Huacai Chen <chenhc@lemote.com> Applied with Gerd's ack to pci/misc for v5.9, thanks! I also updated this in samples/vfio-mdev/mdpy-defs.h: -#define MDPY_PCI_VENDOR_ID 0x1b36 /* redhat */ +#define MDPY_PCI_VENDOR_ID PCI_VENDOR_ID_REDHAT > --- > drivers/gpu/drm/qxl/qxl_dev.h | 2 -- > drivers/net/ethernet/rocker/rocker_hw.h | 1 - > include/linux/pci_ids.h | 2 ++ > 3 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/qxl/qxl_dev.h b/drivers/gpu/drm/qxl/qxl_dev.h > index a0ee416..a7bc31f 100644 > --- a/drivers/gpu/drm/qxl/qxl_dev.h > +++ b/drivers/gpu/drm/qxl/qxl_dev.h > @@ -131,8 +131,6 @@ enum SpiceCursorType { > > #pragma pack(push, 1) > > -#define REDHAT_PCI_VENDOR_ID 0x1b36 > - > /* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */ > #define QXL_DEVICE_ID_STABLE 0x0100 > > diff --git a/drivers/net/ethernet/rocker/rocker_hw.h b/drivers/net/ethernet/rocker/rocker_hw.h > index 59f1f8b..62fd84c 100644 > --- a/drivers/net/ethernet/rocker/rocker_hw.h > +++ b/drivers/net/ethernet/rocker/rocker_hw.h > @@ -25,7 +25,6 @@ enum { > > #define ROCKER_FP_PORTS_MAX 62 > > -#define PCI_VENDOR_ID_REDHAT 0x1b36 > #define PCI_DEVICE_ID_REDHAT_ROCKER 0x0006 > > #define ROCKER_PCI_BAR0_SIZE 0x2000 > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index 0ad5769..5c709a1 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -2585,6 +2585,8 @@ > > #define PCI_VENDOR_ID_ASMEDIA 0x1b21 > > +#define PCI_VENDOR_ID_REDHAT 0x1b36 > + > #define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c36 > > #define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 > -- > 2.7.0 >
On Thu, 9 Jul 2020 17:03:24 -0500 Bjorn Helgaas <helgaas@kernel.org> wrote: > [+cc Kirti, Alex, kvm] > > On Wed, Jul 08, 2020 at 03:59:30PM +0800, Huacai Chen wrote: > > Instead of duplicating the PCI_VENDOR_ID_REDHAT definition everywhere, > > move it to include/linux/pci_ids.h is better. > > > > Signed-off-by: Huacai Chen <chenhc@lemote.com> > > Applied with Gerd's ack to pci/misc for v5.9, thanks! > > I also updated this in samples/vfio-mdev/mdpy-defs.h: > > -#define MDPY_PCI_VENDOR_ID 0x1b36 /* redhat */ > +#define MDPY_PCI_VENDOR_ID PCI_VENDOR_ID_REDHAT Thanks, Bjorn! Alex > > --- > > drivers/gpu/drm/qxl/qxl_dev.h | 2 -- > > drivers/net/ethernet/rocker/rocker_hw.h | 1 - > > include/linux/pci_ids.h | 2 ++ > > 3 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/qxl/qxl_dev.h b/drivers/gpu/drm/qxl/qxl_dev.h > > index a0ee416..a7bc31f 100644 > > --- a/drivers/gpu/drm/qxl/qxl_dev.h > > +++ b/drivers/gpu/drm/qxl/qxl_dev.h > > @@ -131,8 +131,6 @@ enum SpiceCursorType { > > > > #pragma pack(push, 1) > > > > -#define REDHAT_PCI_VENDOR_ID 0x1b36 > > - > > /* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */ > > #define QXL_DEVICE_ID_STABLE 0x0100 > > > > diff --git a/drivers/net/ethernet/rocker/rocker_hw.h b/drivers/net/ethernet/rocker/rocker_hw.h > > index 59f1f8b..62fd84c 100644 > > --- a/drivers/net/ethernet/rocker/rocker_hw.h > > +++ b/drivers/net/ethernet/rocker/rocker_hw.h > > @@ -25,7 +25,6 @@ enum { > > > > #define ROCKER_FP_PORTS_MAX 62 > > > > -#define PCI_VENDOR_ID_REDHAT 0x1b36 > > #define PCI_DEVICE_ID_REDHAT_ROCKER 0x0006 > > > > #define ROCKER_PCI_BAR0_SIZE 0x2000 > > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > > index 0ad5769..5c709a1 100644 > > --- a/include/linux/pci_ids.h > > +++ b/include/linux/pci_ids.h > > @@ -2585,6 +2585,8 @@ > > > > #define PCI_VENDOR_ID_ASMEDIA 0x1b21 > > > > +#define PCI_VENDOR_ID_REDHAT 0x1b36 > > + > > #define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c36 > > > > #define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 > > -- > > 2.7.0 > > >
diff --git a/drivers/gpu/drm/qxl/qxl_dev.h b/drivers/gpu/drm/qxl/qxl_dev.h index a0ee416..a7bc31f 100644 --- a/drivers/gpu/drm/qxl/qxl_dev.h +++ b/drivers/gpu/drm/qxl/qxl_dev.h @@ -131,8 +131,6 @@ enum SpiceCursorType { #pragma pack(push, 1) -#define REDHAT_PCI_VENDOR_ID 0x1b36 - /* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */ #define QXL_DEVICE_ID_STABLE 0x0100 diff --git a/drivers/net/ethernet/rocker/rocker_hw.h b/drivers/net/ethernet/rocker/rocker_hw.h index 59f1f8b..62fd84c 100644 --- a/drivers/net/ethernet/rocker/rocker_hw.h +++ b/drivers/net/ethernet/rocker/rocker_hw.h @@ -25,7 +25,6 @@ enum { #define ROCKER_FP_PORTS_MAX 62 -#define PCI_VENDOR_ID_REDHAT 0x1b36 #define PCI_DEVICE_ID_REDHAT_ROCKER 0x0006 #define ROCKER_PCI_BAR0_SIZE 0x2000 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 0ad5769..5c709a1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2585,6 +2585,8 @@ #define PCI_VENDOR_ID_ASMEDIA 0x1b21 +#define PCI_VENDOR_ID_REDHAT 0x1b36 + #define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c36 #define PCI_VENDOR_ID_CIRCUITCO 0x1cc8
Instead of duplicating the PCI_VENDOR_ID_REDHAT definition everywhere, move it to include/linux/pci_ids.h is better. Signed-off-by: Huacai Chen <chenhc@lemote.com> --- drivers/gpu/drm/qxl/qxl_dev.h | 2 -- drivers/net/ethernet/rocker/rocker_hw.h | 1 - include/linux/pci_ids.h | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-)