aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-04-17 00:01:07 -0400
committerRoland Dreier <rolandd@cisco.com>2008-04-17 00:01:07 -0400
commit6358ae25fd0d8cb4eab5e4e152ade8ac406b5278 (patch)
tree9f4c3d192f3dd944c38401b359d2a2c8971e4b7b /drivers/infiniband
parent6ef6aee2f0ff111a2439b02b9d788097ca82f9d1 (diff)
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>
Diffstat (limited to 'drivers/infiniband')
-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 4471674975cd..5428affa9102 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,
523 * initial values of the generation bit correct. 523 * initial values of the generation bit correct.
524 */ 524 */
525 for (i = 0; i < dd->ipath_pioavregs; i++) { 525 for (i = 0; i < dd->ipath_pioavregs; i++) {
526 __le64 val; 526 __le64 pioavail;
527 527
528 /* 528 /*
529 * Chip Errata bug 6641; even and odd qwords>3 are swapped. 529 * Chip Errata bug 6641; even and odd qwords>3 are swapped.
530 */ 530 */
531 if (i > 3 && (dd->ipath_flags & IPATH_SWAP_PIOBUFS)) 531 if (i > 3 && (dd->ipath_flags & IPATH_SWAP_PIOBUFS))
532 val = dd->ipath_pioavailregs_dma[i ^ 1]; 532 pioavail = dd->ipath_pioavailregs_dma[i ^ 1];
533 else 533 else
534 val = dd->ipath_pioavailregs_dma[i]; 534 pioavail = dd->ipath_pioavailregs_dma[i];
535 dd->ipath_pioavailshadow[i] = le64_to_cpu(val); 535 dd->ipath_pioavailshadow[i] = le64_to_cpu(pioavail);
536 } 536 }
537 /* can get counters, stats, etc. */ 537 /* can get counters, stats, etc. */
538 dd->ipath_flags |= IPATH_PRESENT; 538 dd->ipath_flags |= IPATH_PRESENT;