Re: [PATCH 1/1] pci: move PCI_VENDOR_ID_VMWARE to pci_ids.h

[Bjorn Helgaas]

On Wed, Sep 24, 2014 at 10:29:23AM -0700, Francesco Ruggeri wrote:
> From b99b1ec156ab351668eb77a00a57a4ae095eec28 Mon Sep 17 00:00:00 2001
> From: Francesco Ruggeri <fruggeri@xxxxxxxxxx>
> Date: Wed, 24 Sep 2014 10:12:41 -0700
> Subject: [PATCH 1/1] pci: move PCI_VENDOR_ID_VMWARE to pci_ids.h
> 
> Moving PCI_VENDOR_ID_VMWARE from device specific files to pci_ids.h.
> It is useful to always have access to it, especially when accessing
> subsystem_vendor_id on emulated devices.
> 
> Signed-off-by: Francesco Ruggeri <fruggeri@xxxxxxxxxx>

Applied to pci/misc for v3.18, thanks!

> ---
>  drivers/gpu/drm/vmwgfx/svga_reg.h  | 1 -
>  drivers/misc/vmw_vmci/vmci_guest.c | 1 -
>  drivers/net/vmxnet3/vmxnet3_int.h  | 1 -
>  drivers/scsi/vmw_pvscsi.h          | 1 -
>  include/linux/pci_ids.h            | 2 ++
>  5 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/svga_reg.h b/drivers/gpu/drm/vmwgfx/svga_reg.h
> index 11323dd..e4259c2 100644
> --- a/drivers/gpu/drm/vmwgfx/svga_reg.h
> +++ b/drivers/gpu/drm/vmwgfx/svga_reg.h
> @@ -35,7 +35,6 @@
>  /*
>   * PCI device IDs.
>   */
> -#define PCI_VENDOR_ID_VMWARE            0x15AD
>  #define PCI_DEVICE_ID_VMWARE_SVGA2      0x0405
>  
>  /*
> diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
> index 248399a..189b325 100644
> --- a/drivers/misc/vmw_vmci/vmci_guest.c
> +++ b/drivers/misc/vmw_vmci/vmci_guest.c
> @@ -35,7 +35,6 @@
>  #include "vmci_driver.h"
>  #include "vmci_event.h"
>  
> -#define PCI_VENDOR_ID_VMWARE		0x15AD
>  #define PCI_DEVICE_ID_VMWARE_VMCI	0x0740
>  
>  #define VMCI_UTIL_NUM_RESOURCES 1
> diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
> index 3759479..5f0199f 100644
> --- a/drivers/net/vmxnet3/vmxnet3_int.h
> +++ b/drivers/net/vmxnet3/vmxnet3_int.h
> @@ -117,7 +117,6 @@ enum {
>  /*
>   * PCI vendor and device IDs.
>   */
> -#define PCI_VENDOR_ID_VMWARE            0x15AD
>  #define PCI_DEVICE_ID_VMWARE_VMXNET3    0x07B0
>  #define MAX_ETHERNET_CARDS		10
>  #define MAX_PCI_PASSTHRU_DEVICE		6
> diff --git a/drivers/scsi/vmw_pvscsi.h b/drivers/scsi/vmw_pvscsi.h
> index ce45888..ee16f0c 100644
> --- a/drivers/scsi/vmw_pvscsi.h
> +++ b/drivers/scsi/vmw_pvscsi.h
> @@ -32,7 +32,6 @@
>  
>  #define MASK(n)        ((1 << (n)) - 1)        /* make an n-bit mask */
>  
> -#define PCI_VENDOR_ID_VMWARE		0x15AD
>  #define PCI_DEVICE_ID_VMWARE_PVSCSI	0x07C0
>  
>  /*
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 6ed0bb7..e62b20a 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2971,4 +2971,6 @@
>  
>  #define PCI_VENDOR_ID_OCZ		0x1b85
>  
> +#define PCI_VENDOR_ID_VMWARE		0x15AD
> +
>  #endif /* _LINUX_PCI_IDS_H */
> -- 
> 1.8.1.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
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/