]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] aacraid: variable redefinition hides earlier warning
authorSalyzyn, Mark <Mark_Salyzyn@adaptec.com>
Tue, 8 Jan 2008 20:32:00 +0000 (12:32 -0800)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 23 Jan 2008 17:29:19 +0000 (11:29 -0600)
The parameter 'info' is reused, renamed the second to sinfo to
represent supplemental adapter info, to suppress compile warning
message.

Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/aacraid/aachba.c

index eee65c145cb8b6e85fc39e6cbe3b7e146e58c34f..94577c03a23adb4df682113fd6ddfb557ae1f934 100644 (file)
@@ -1240,24 +1240,24 @@ int aac_get_adapter_info(struct aac_dev* dev)
        memcpy(&dev->adapter_info, info, sizeof(*info));
 
        if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {
-               struct aac_supplement_adapter_info * info;
+               struct aac_supplement_adapter_info * sinfo;
 
                aac_fib_init(fibptr);
 
-               info = (struct aac_supplement_adapter_info *) fib_data(fibptr);
+               sinfo = (struct aac_supplement_adapter_info *) fib_data(fibptr);
 
-               memset(info,0,sizeof(*info));
+               memset(sinfo,0,sizeof(*sinfo));
 
                rcode = aac_fib_send(RequestSupplementAdapterInfo,
                                 fibptr,
-                                sizeof(*info),
+                                sizeof(*sinfo),
                                 FsaNormal,
                                 1, 1,
                                 NULL,
                                 NULL);
 
                if (rcode >= 0)
-                       memcpy(&dev->supplement_adapter_info, info, sizeof(*info));
+                       memcpy(&dev->supplement_adapter_info, sinfo, sizeof(*sinfo));
        }