Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6dcd4a7fe5dfaace2763187d6941e700a8bc6f27
Commit:     6dcd4a7fe5dfaace2763187d6941e700a8bc6f27
Parent:     a3940da5e6fe8b833eecdbca3fac9456b4204d6e
Author:     Salyzyn, Mark <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 8 13:08:04 2008 -0800
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Wed Jan 23 11:29:20 2008 -0600

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/aacraid/commctrl.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 1e6d7a9..a27207e 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)
         */
 return_fib:
        if (!list_empty(&fibctx->fib_list)) {
-               struct list_head * entry;
                /*
                 *      Pull the next fib from the fibs
                 */
@@ -582,7 +581,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void 
__user * arg)
                                void* p;
                                /* Does this really need to be GFP_DMA? */
                                p = 
kmalloc(upsg->sg[i].count,GFP_KERNEL|__GFP_DMA);
-                               if(p == 0) {
+                               if(!p) {
                                        dprintk((KERN_DEBUG"aacraid: Could not 
allocate SG buffer - size = %d buffer number %d of %d\n",
                                          upsg->sg[i].count,i,upsg->count));
                                        rcode = -ENOMEM;
@@ -626,7 +625,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void 
__user * arg)
                                void* p;
                                /* Does this really need to be GFP_DMA? */
                                p = 
kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
-                               if(p == 0) {
+                               if(!p) {
                                        kfree (usg);
                                        dprintk((KERN_DEBUG"aacraid: Could not 
allocate SG buffer - size = %d buffer number %d of %d\n",
                                          usg->sg[i].count,i,usg->count));
@@ -668,7 +667,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void 
__user * arg)
                                void* p;
                                /* Does this really need to be GFP_DMA? */
                                p = 
kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
-                               if(p == 0) {
+                               if(!p) {
                                        dprintk((KERN_DEBUG"aacraid: Could not 
allocate SG buffer - size = %d buffer number %d of %d\n",
                                          usg->sg[i].count,i,usg->count));
                                        rcode = -ENOMEM;
@@ -698,7 +697,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void 
__user * arg)
                                dma_addr_t addr;
                                void* p;
                                p = kmalloc(upsg->sg[i].count, GFP_KERNEL);
-                               if(p == 0) {
+                               if (!p) {
                                        dprintk((KERN_DEBUG"aacraid: Could not 
allocate SG buffer - size = %d buffer number %d of %d\n",
                                          upsg->sg[i].count, i, upsg->count));
                                        rcode = -ENOMEM;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to