aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2010-04-30 09:34:32 -0400
committerJiri Kosina <jkosina@suse.cz>2010-05-11 03:59:26 -0400
commitc2d45b4da042720ae94648b417d0e051742441d4 (patch)
tree920d75ff3fe955ce01121fbb527fdd15015a6549
parentca0dbd86b12be9af7cda230890eb741d5cb8b624 (diff)
cciss: fix shadows sparse warning
Fix sparse warnings: drivers/block/cciss.c:1591:37: warning: symbol 'i' shadows an earlier one drivers/block/cciss.c:2437:21: warning: symbol 'i' shadows an earlier one Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/block/cciss.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index eb5ff0531cfb..51ceaee98f9f 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1588,7 +1588,6 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
1588 1588
1589 c->Request = ioc->Request; 1589 c->Request = ioc->Request;
1590 if (ioc->buf_size > 0) { 1590 if (ioc->buf_size > 0) {
1591 int i;
1592 for (i = 0; i < sg_used; i++) { 1591 for (i = 0; i < sg_used; i++) {
1593 temp64.val = 1592 temp64.val =
1594 pci_map_single(host->pdev, buff[i], 1593 pci_map_single(host->pdev, buff[i],
@@ -2434,7 +2433,7 @@ static int deregister_disk(ctlr_info_t *h, int drv_index,
2434 2433
2435 /* if it was the last disk, find the new hightest lun */ 2434 /* if it was the last disk, find the new hightest lun */
2436 if (clear_all && recalculate_highest_lun) { 2435 if (clear_all && recalculate_highest_lun) {
2437 int i, newhighest = -1; 2436 int newhighest = -1;
2438 for (i = 0; i <= h->highest_lun; i++) { 2437 for (i = 0; i <= h->highest_lun; i++) {
2439 /* if the disk has size > 0, it is available */ 2438 /* if the disk has size > 0, it is available */
2440 if (h->drv[i] && h->drv[i]->heads) 2439 if (h->drv[i] && h->drv[i]->heads)