Messages in this thread Patch in this message | | | Subject | [PATCH 3/3] scsi: ch.c fix shadowed variable warnings | From | Harvey Harrison <> | Date | Tue, 04 Mar 2008 23:40:56 -0800 |
| |
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.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> --- drivers/scsi/ch.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index 7aad154..f9c3f3a 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c @@ -268,16 +268,16 @@ ch_read_element_status(scsi_changer *ch, u_int elem, char *data) static int ch_init_elem(scsi_changer *ch) { - int err; + int ch_err; u_char cmd[6]; vprintk("INITIALIZE ELEMENT STATUS, may take some time ...\n"); memset(cmd,0,sizeof(cmd)); cmd[0] = INITIALIZE_ELEMENT_STATUS; cmd[1] = ch->device->lun << 5; - err = ch_do_scsi(ch, cmd, NULL, 0, DMA_NONE); + ch_err = ch_do_scsi(ch, cmd, NULL, 0, DMA_NONE); vprintk("... finished\n"); - return err; + return ch_err; } static int @@ -721,7 +721,7 @@ static long ch_ioctl(struct file *file, case CHIOGELEM: { struct changer_get_element cge; - u_char cmd[12]; + u_char ch_cmd[12]; u_char *buffer; unsigned int elem; int result,i; @@ -739,17 +739,18 @@ static long ch_ioctl(struct file *file, mutex_lock(&ch->lock); voltag_retry: - memset(cmd,0,sizeof(cmd)); - cmd[0] = READ_ELEMENT_STATUS; - cmd[1] = (ch->device->lun << 5) | - (ch->voltags ? 0x10 : 0) | - ch_elem_to_typecode(ch,elem); - cmd[2] = (elem >> 8) & 0xff; - cmd[3] = elem & 0xff; - cmd[5] = 1; - cmd[9] = 255; - - if (0 == (result = ch_do_scsi(ch, cmd, buffer, 256, DMA_FROM_DEVICE))) { + memset(ch_cmd,0,sizeof(ch_cmd)); + ch_cmd[0] = READ_ELEMENT_STATUS; + ch_cmd[1] = (ch->device->lun << 5) | + (ch->voltags ? 0x10 : 0) | + ch_elem_to_typecode(ch,elem); + ch_cmd[2] = (elem >> 8) & 0xff; + ch_cmd[3] = elem & 0xff; + ch_cmd[5] = 1; + ch_cmd[9] = 255; + + result = ch_do_scsi(ch, ch_cmd, buffer, 256, DMA_FROM_DEVICE); + if (!result) { cge.cge_status = buffer[18]; cge.cge_flags = 0; if (buffer[18] & CESTATUS_EXCEPT) { -- 1.5.4.GIT
| |