aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/pci_fire.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-27 02:40:02 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-16 21:19:15 -0400
commitc6fee0810df4e0f4cf9c4834d2569ca01c02cffc (patch)
tree7b6adabf750ca0279895f8b9aa8a42eb9837e4e2 /arch/sparc/kernel/pci_fire.c
parent0399bb5b918bd8ffbf065a3db142ff121aaa18e0 (diff)
sparc64: Fix build errors with gcc-4.6.0
Most of the warnings emitted (we fail arch/sparc file builds with -Werror) were legitimate but harmless, however one case (n2_pcr_write) was a genuine bug. Based almost entirely upon a patch by Sam Ravnborg. Reported-by: Dennis Gilmore <dennis@ausil.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/pci_fire.c')
-rw-r--r--arch/sparc/kernel/pci_fire.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci_fire.c b/arch/sparc/kernel/pci_fire.c
index 43d691b67d52..3d70f8326efd 100644
--- a/arch/sparc/kernel/pci_fire.c
+++ b/arch/sparc/kernel/pci_fire.c
@@ -214,11 +214,9 @@ static int pci_fire_msi_setup(struct pci_pbm_info *pbm, unsigned long msiqid,
214 214
215static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi) 215static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi)
216{ 216{
217 unsigned long msiqid;
218 u64 val; 217 u64 val;
219 218
220 val = upa_readq(pbm->pbm_regs + MSI_MAP(msi)); 219 val = upa_readq(pbm->pbm_regs + MSI_MAP(msi));
221 msiqid = (val & MSI_MAP_EQNUM);
222 220
223 val &= ~MSI_MAP_VALID; 221 val &= ~MSI_MAP_VALID;
224 222