Patchwork msix: remove duplicated defines.

login
register
mail settings
Submitter Isaku Yamahata
Date May 27, 2010, 5:40 a.m.
Message ID <20100527054037.GF31807@valinux.co.jp>
Download mbox | patch
Permalink /patch/53690/
State New
Headers show

Comments

Isaku Yamahata - May 27, 2010, 5:40 a.m.
remove defines which are already defined in pci_regs.h

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 hw/msix.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
Michael S. Tsirkin - May 27, 2010, 2:15 p.m.
On Thu, May 27, 2010 at 02:40:37PM +0900, Isaku Yamahata wrote:
> remove defines which are already defined in pci_regs.h
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Applied, thanks!

> ---
>  hw/msix.c |    8 --------
>  1 files changed, 0 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/msix.c b/hw/msix.c
> index 2ca0900..1613bb4 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -15,14 +15,6 @@
>  #include "msix.h"
>  #include "pci.h"
>  
> -/* Declaration from linux/pci_regs.h */
> -#define  PCI_CAP_ID_MSIX 0x11 /* MSI-X */
> -#define  PCI_MSIX_FLAGS 2     /* Table at lower 11 bits */
> -#define  PCI_MSIX_FLAGS_QSIZE	0x7FF
> -#define  PCI_MSIX_FLAGS_ENABLE	(1 << 15)
> -#define  PCI_MSIX_FLAGS_MASKALL	(1 << 14)
> -#define  PCI_MSIX_FLAGS_BIRMASK	(7 << 0)
> -
>  /* MSI-X capability structure */
>  #define MSIX_TABLE_OFFSET 4
>  #define MSIX_PBA_OFFSET 8
> -- 
> 1.6.6.1
>

Patch

diff --git a/hw/msix.c b/hw/msix.c
index 2ca0900..1613bb4 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -15,14 +15,6 @@ 
 #include "msix.h"
 #include "pci.h"
 
-/* Declaration from linux/pci_regs.h */
-#define  PCI_CAP_ID_MSIX 0x11 /* MSI-X */
-#define  PCI_MSIX_FLAGS 2     /* Table at lower 11 bits */
-#define  PCI_MSIX_FLAGS_QSIZE	0x7FF
-#define  PCI_MSIX_FLAGS_ENABLE	(1 << 15)
-#define  PCI_MSIX_FLAGS_MASKALL	(1 << 14)
-#define  PCI_MSIX_FLAGS_BIRMASK	(7 << 0)
-
 /* MSI-X capability structure */
 #define MSIX_TABLE_OFFSET 4
 #define MSIX_PBA_OFFSET 8