aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid
diff options
context:
space:
mode:
authorSalyzyn, Mark <Mark_Salyzyn@adaptec.com>2008-01-08 16:08:04 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-23 12:29:20 -0500
commit6dcd4a7fe5dfaace2763187d6941e700a8bc6f27 (patch)
tree598fee42d167757827257981ecec8c3cf5e01f24 /drivers/scsi/aacraid
parenta3940da5e6fe8b833eecdbca3fac9456b4204d6e (diff)
[SCSI] aacraid: fix multiple definition of automatic variable warning.
The 'entry' automatic variable was defined at the top and within a block that uses it, removed the definition from the block that uses it. Some cosmetic changes were made while in the same file. This patch should be inert. Signed-off-by: Mark Salyzyn <aacraid@adaptec.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/aacraid')
-rw-r--r--drivers/scsi/aacraid/commctrl.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 1e6d7a9c75bf..a27207e27c30 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -275,7 +275,6 @@ static int next_getadapter_fib(struct aac_dev * dev, void __user *arg)
275 */ 275 */
276return_fib: 276return_fib:
277 if (!list_empty(&fibctx->fib_list)) { 277 if (!list_empty(&fibctx->fib_list)) {
278 struct list_head * entry;
279 /* 278 /*
280 * Pull the next fib from the fibs 279 * Pull the next fib from the fibs
281 */ 280 */
@@ -582,7 +581,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
582 void* p; 581 void* p;
583 /* Does this really need to be GFP_DMA? */ 582 /* Does this really need to be GFP_DMA? */
584 p = kmalloc(upsg->sg[i].count,GFP_KERNEL|__GFP_DMA); 583 p = kmalloc(upsg->sg[i].count,GFP_KERNEL|__GFP_DMA);
585 if(p == 0) { 584 if(!p) {
586 dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n", 585 dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
587 upsg->sg[i].count,i,upsg->count)); 586 upsg->sg[i].count,i,upsg->count));
588 rcode = -ENOMEM; 587 rcode = -ENOMEM;
@@ -626,7 +625,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
626 void* p; 625 void* p;
627 /* Does this really need to be GFP_DMA? */ 626 /* Does this really need to be GFP_DMA? */
628 p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA); 627 p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
629 if(p == 0) { 628 if(!p) {
630 kfree (usg); 629 kfree (usg);
631 dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n", 630 dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
632 usg->sg[i].count,i,usg->count)); 631 usg->sg[i].count,i,usg->count));
@@ -668,7 +667,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
668 void* p; 667 void* p;
669 /* Does this really need to be GFP_DMA? */ 668 /* Does this really need to be GFP_DMA? */
670 p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA); 669 p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
671 if(p == 0) { 670 if(!p) {
672 dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n", 671 dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
673 usg->sg[i].count,i,usg->count)); 672 usg->sg[i].count,i,usg->count));
674 rcode = -ENOMEM; 673 rcode = -ENOMEM;
@@ -698,7 +697,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
698 dma_addr_t addr; 697 dma_addr_t addr;
699 void* p; 698 void* p;
700 p = kmalloc(upsg->sg[i].count, GFP_KERNEL); 699 p = kmalloc(upsg->sg[i].count, GFP_KERNEL);
701 if(p == 0) { 700 if (!p) {
702 dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n", 701 dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
703 upsg->sg[i].count, i, upsg->count)); 702 upsg->sg[i].count, i, upsg->count));
704 rcode = -ENOMEM; 703 rcode = -ENOMEM;