From 7576ee61d2438827ba88bbfec04d1c3bda2d4030 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 17 Apr 2013 17:44:48 -0600
Subject: [PATCH] --- yaml --- r: 362911 b: refs/heads/master c:
 527eee292d2ee69708a20b90049ef49bdeefc882 h: refs/heads/master i:   362909:
 6d22eb92c7e7fc56dba2aec725d788323b984a74   362907:
 b4e83b7508a38c30e7d0351ac6668e46f3c60cfb   362903:
 0927c4dba67086f0891d8fb23d3f1c43cc5b4bcf   362895:
 f577b4a9c6e969c796763a9e0008ec060d5ae6f9   362879:
 14cfcf797d382741e336a6173710822bab59039d v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/msi.c | 7 +++++--
 trunk/drivers/pci/msi.h | 3 ---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f4dbebfccb5f..d905ac82d428 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 909094c62e21c71c4fd122642512ad05b75fe019
+refs/heads/master: 527eee292d2ee69708a20b90049ef49bdeefc882
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index fb07e05a947b..06c5f6edb150 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -26,6 +26,9 @@
 
 static int pci_msi_enable = 1;
 
+#define msix_table_size(flags)	((flags & PCI_MSIX_FLAGS_QSIZE) + 1)
+
+
 /* Arch hooks */
 
 #ifndef arch_msi_check_device
@@ -681,7 +684,7 @@ static int msix_capability_init(struct pci_dev *dev,
 	pci_write_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, control);
 
 	/* Request & Map MSI-X table region */
-	base = msix_map_region(dev, multi_msix_capable(control));
+	base = msix_map_region(dev, msix_table_size(control));
 	if (!base)
 		return -ENOMEM;
 
@@ -904,7 +907,7 @@ int pci_msix_table_size(struct pci_dev *dev)
 		return 0;
 
 	pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control);
-	return multi_msix_capable(control);
+	return msix_table_size(control);
 }
 
 /**
diff --git a/trunk/drivers/pci/msi.h b/trunk/drivers/pci/msi.h
index d76c7b2c993c..df128309f837 100644
--- a/trunk/drivers/pci/msi.h
+++ b/trunk/drivers/pci/msi.h
@@ -9,7 +9,4 @@
 #define msi_mask_reg(base, is64bit)	\
 	(base + ((is64bit == 1) ? PCI_MSI_MASK_64 : PCI_MSI_MASK_32))
 
-#define msix_table_size(control) 	((control & PCI_MSIX_FLAGS_QSIZE)+1)
-#define multi_msix_capable(control)	msix_table_size((control))
-
 #endif /* MSI_H */