From b4e83b7508a38c30e7d0351ac6668e46f3c60cfb Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 17 Apr 2013 17:39:57 -0600
Subject: [PATCH] --- yaml --- r: 362907 b: refs/heads/master c:
 9925ad0cf12675203cf209e1d96ebab19f19c86a h: refs/heads/master i:   362905:
 c4053558f70649a5b5983d201a3d5f43a3be2b93   362903:
 0927c4dba67086f0891d8fb23d3f1c43cc5b4bcf v: v3

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

diff --git a/[refs] b/[refs]
index e3f1e46e624b..da4dd628f648 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f84ecd285f40012f804173110c10f2caaa23b7ee
+refs/heads/master: 9925ad0cf12675203cf209e1d96ebab19f19c86a
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index b1a60e0a1ee3..7011c5d95e5e 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -244,11 +244,11 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 		int pos = dev->msi_cap;
 		u16 data;
 
-		pci_read_config_dword(dev, msi_lower_address_reg(pos),
-					&msg->address_lo);
+		pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
+				      &msg->address_lo);
 		if (entry->msi_attrib.is_64) {
-			pci_read_config_dword(dev, msi_upper_address_reg(pos),
-						&msg->address_hi);
+			pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
+					      &msg->address_hi);
 			pci_read_config_word(dev, msi_data_reg(pos, 1), &data);
 		} else {
 			msg->address_hi = 0;
@@ -304,11 +304,11 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 		msgctl |= entry->msi_attrib.multiple << 4;
 		pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl);
 
-		pci_write_config_dword(dev, msi_lower_address_reg(pos),
-					msg->address_lo);
+		pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
+				       msg->address_lo);
 		if (entry->msi_attrib.is_64) {
-			pci_write_config_dword(dev, msi_upper_address_reg(pos),
-						msg->address_hi);
+			pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
+					       msg->address_hi);
 			pci_write_config_word(dev, msi_data_reg(pos, 1),
 						msg->data);
 		} else {
diff --git a/trunk/drivers/pci/msi.h b/trunk/drivers/pci/msi.h
index 6aa7b1903796..e5b87d60cb95 100644
--- a/trunk/drivers/pci/msi.h
+++ b/trunk/drivers/pci/msi.h
@@ -6,8 +6,6 @@
 #ifndef MSI_H
 #define MSI_H
 
-#define msi_lower_address_reg(base)	(base + PCI_MSI_ADDRESS_LO)
-#define msi_upper_address_reg(base)	(base + PCI_MSI_ADDRESS_HI)
 #define msi_data_reg(base, is64bit)	\
 	(base + ((is64bit == 1) ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32))
 #define msi_mask_reg(base, is64bit)	\