---

yaml
---
r: 192571
b: refs/heads/master
c: c2d45b4
h: refs/heads/master
i:
  192569: 9ffb464
  192567: cae373a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca0dbd86b12be9af7cda230890eb741d5cb8b624
+refs/heads/master: c2d45b4da042720ae94648b417d0e051742441d4

trunk/drivers/block/cciss.c

@@ -1588,7 +1588,6 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
 
 			c->Request = ioc->Request;
 			if (ioc->buf_size > 0) {
-				int i;
 				for (i = 0; i < sg_used; i++) {
 					temp64.val =
 					    pci_map_single(host->pdev, buff[i],
@@ -2434,7 +2433,7 @@ static int deregister_disk(ctlr_info_t *h, int drv_index,
 
 	/* if it was the last disk, find the new hightest lun */
 	if (clear_all && recalculate_highest_lun) {
-		int i, newhighest = -1;
+		int newhighest = -1;
 		for (i = 0; i <= h->highest_lun; i++) {
 			/* if the disk has size > 0, it is available */
 			if (h->drv[i] && h->drv[i]->heads)