On Sun, 2008-03-30 at 12:21 -0500, James Bottomley wrote: > On Fri, 2008-03-28 at 14:48 -0700, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > > From: Harvey Harrison <harvey.harrison@xxxxxxxxx> > > > > err shadows the array of errors in this driver, switch to ch_err > > drivers/scsi/ch.c:271:6: warning: symbol 'err' shadows an earlier one > > drivers/scsi/ch.c:116:3: originally declared here > > > > cmd shadows the argument to this function, switch to ch_cmd > > drivers/scsi/ch.c:724:11: warning: symbol 'cmd' shadows an earlier one > > drivers/scsi/ch.c:596:20: originally declared here > > > > Small code cleanup as well in if() statement. > > > > [akpm@xxxxxxxxxxxxxxxxxxxx: coding-style fixes] > > Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx> > > Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> > > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > > --- > > > > drivers/scsi/ch.c | 29 +++++++++++++++-------------- > > 1 file changed, 15 insertions(+), 14 deletions(-) > > > > diff -puN drivers/scsi/ch.c~scsi-chc-fix-shadowed-variable-warnings drivers/scsi/ch.c > > --- a/drivers/scsi/ch.c~scsi-chc-fix-shadowed-variable-warnings > > +++ a/drivers/scsi/ch.c > > @@ -268,16 +268,16 @@ ch_read_element_status(scsi_changer *ch, > > static int > > ch_init_elem(scsi_changer *ch) > > { > > - int err; > > + int ch_err; > > This isn't really the correct fix, is it? The driver stupidity is > having a global (although static) variable called err which invites > problems like this. How about this fix? > If you like that better, sure. Harvey -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html