summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-04-16 21:01:07 -0700
committerRoland Dreier <rolandd@cisco.com>2008-04-16 21:01:07 -0700
commit6358ae25fd0d8cb4eab5e4e152ade8ac406b5278 (patch)
tree9f4c3d192f3dd944c38401b359d2a2c8971e4b7b
parent6ef6aee2f0ff111a2439b02b9d788097ca82f9d1 (diff)
downloadkernel-crypto-6358ae25fd0d8cb4eab5e4e152ade8ac406b5278.tar.gz
kernel-crypto-6358ae25fd0d8cb4eab5e4e152ade8ac406b5278.tar.xz
kernel-crypto-6358ae25fd0d8cb4eab5e4e152ade8ac406b5278.zip
IB/ipath: Fix sparse warning about shadowed symbol
Fix drivers/infiniband/hw/ipath/ipath_init_chip.c:526:10: warning: symbol 'val' shadows an earlier one drivers/infiniband/hw/ipath/ipath_init_chip.c:473:6: originally declared here by giving the second val a different name. Signed-off-by: Roland Dreier <rolandd@cisco.com> Acked-by: Arthur Jones <arthur.jones@qlogic.com>
-rw-r--r--drivers/infiniband/hw/ipath/ipath_init_chip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index 4471674975c..5428affa910 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -523,16 +523,16 @@ static void enable_chip(struct ipath_devdata *dd,
* initial values of the generation bit correct.
*/
for (i = 0; i < dd->ipath_pioavregs; i++) {
- __le64 val;
+ __le64 pioavail;
/*
* Chip Errata bug 6641; even and odd qwords>3 are swapped.
*/
if (i > 3 && (dd->ipath_flags & IPATH_SWAP_PIOBUFS))
- val = dd->ipath_pioavailregs_dma[i ^ 1];
+ pioavail = dd->ipath_pioavailregs_dma[i ^ 1];
else
- val = dd->ipath_pioavailregs_dma[i];
- dd->ipath_pioavailshadow[i] = le64_to_cpu(val);
+ pioavail = dd->ipath_pioavailregs_dma[i];
+ dd->ipath_pioavailshadow[i] = le64_to_cpu(pioavail);
}
/* can get counters, stats, etc. */
dd->ipath_flags |= IPATH_PRESENT;