aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSalyzyn, Mark <Mark_Salyzyn@adaptec.com>2008-01-08 15:32:00 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-23 12:29:19 -0500
commit06a43d1725f59a0f5e043bd06081c44ae528098e (patch)
tree475919d0a64c2cf6599437886027f6d4d2a05eac
parent17eaaceef52b1ce5ca061d49a1ff9ae56ccce1e1 (diff)
[SCSI] aacraid: variable redefinition hides earlier warning
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>
-rw-r--r--drivers/scsi/aacraid/aachba.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index eee65c145cb8..94577c03a23a 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1240,24 +1240,24 @@ int aac_get_adapter_info(struct aac_dev* dev)
1240 memcpy(&dev->adapter_info, info, sizeof(*info)); 1240 memcpy(&dev->adapter_info, info, sizeof(*info));
1241 1241
1242 if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) { 1242 if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {
1243 struct aac_supplement_adapter_info * info; 1243 struct aac_supplement_adapter_info * sinfo;
1244 1244
1245 aac_fib_init(fibptr); 1245 aac_fib_init(fibptr);
1246 1246
1247 info = (struct aac_supplement_adapter_info *) fib_data(fibptr); 1247 sinfo = (struct aac_supplement_adapter_info *) fib_data(fibptr);
1248 1248
1249 memset(info,0,sizeof(*info)); 1249 memset(sinfo,0,sizeof(*sinfo));
1250 1250
1251 rcode = aac_fib_send(RequestSupplementAdapterInfo, 1251 rcode = aac_fib_send(RequestSupplementAdapterInfo,
1252 fibptr, 1252 fibptr,
1253 sizeof(*info), 1253 sizeof(*sinfo),
1254 FsaNormal, 1254 FsaNormal,
1255 1, 1, 1255 1, 1,
1256 NULL, 1256 NULL,
1257 NULL); 1257 NULL);
1258 1258
1259 if (rcode >= 0) 1259 if (rcode >= 0)
1260 memcpy(&dev->supplement_adapter_info, info, sizeof(*info)); 1260 memcpy(&dev->supplement_adapter_info, sinfo, sizeof(*sinfo));
1261 } 1261 }
1262 1262
1263 1263