[PATCH 1/1] aacraid: variable redefinition hides earlier warning

["Salyzyn, Mark" <Mark_Salyzyn@xxxxxxxxxxx>]

The parameter 'info' is reused, renamed the second to sinfo to represent supplemental adapter info, to suppress compile warning message.

This attached patch is against current scsi-misc-2.6.

ObligatoryDisclaimer: Please accept my condolences regarding Outlook's handling of patch attachments (inline gets damaged, use attachment).

Signed-off-by: Mark Salyzyn <aacraid@xxxxxxxxxxx>

 drivers/scsi/aacraid/aachba.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/drivers/scsi/aacraid/aachba.c     2008-01-08 15:24:06.451870018 -0500
+++ b/drivers/scsi/aacraid/aachba.c     2008-01-08 15:25:08.971018896 -0500
@@ -1243,24 +1243,24 @@
        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));
        }

Sincerely -- Mark Salyzyn

Attachment: aacraid_info_var_hides_warning.patch
Description: aacraid_info_var_hides_warning.patch