lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] ch: fix sparse shadowed variable warnings

Browse Source 
Replace the global err array with ch_err.
drivers/scsi/ch.c:271:6: warning: symbol 'err' shadows an earlier one
drivers/scsi/ch.c:116:3: originally declared here

Replace the temporary cmd buffer with ch_err to avoid shadowing the cmd
function parameter.
drivers/scsi/ch.c:724:11: warning: symbol 'cmd' shadows an earlier one
drivers/scsi/ch.c:596:20: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Harvey Harrison
2008-03-31 22:05:30 -07:00
committed by James Bottomley
parent 8c5e03d3cf
commit d70d4667e9
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/scsi/ch.c
View File

@@ -113,7 +113,7 @@ static const struct {
unsigned char asc; unsigned char asc;
unsigned char ascq; unsigned char ascq;
int errno; int errno;
} err[] = { } ch_err[] = {
/* Just filled in what looks right. Hav'nt checked any standard paper for /* Just filled in what looks right. Hav'nt checked any standard paper for
these errno assignments, so they may be wrong... */ these errno assignments, so they may be wrong... */
{ {
@@ -155,11 +155,11 @@ static int ch_find_errno(struct scsi_sense_hdr *sshdr)
/* Check to see if additional sense information is available */ /* Check to see if additional sense information is available */
if (scsi_sense_valid(sshdr) && if (scsi_sense_valid(sshdr) &&
sshdr->asc != 0) { sshdr->asc != 0) {
for (i = 0; err[i].errno != 0; i++) { for (i = 0; ch_err[i].errno != 0; i++) {
if (err[i].sense == sshdr->sense_key && if (ch_err[i].sense == sshdr->sense_key &&
err[i].asc == sshdr->asc && ch_err[i].asc == sshdr->asc &&
err[i].ascq == sshdr->ascq) { ch_err[i].ascq == sshdr->ascq) {
errno = -err[i].errno; errno = -ch_err[i].errno;
break; break;
} }
} }
@@ -721,7 +721,7 @@ static long ch_ioctl(struct file *file,
case CHIOGELEM: case CHIOGELEM:
{ {
struct changer_get_element cge; struct changer_get_element cge;
u_char cmd[12]; u_char ch_cmd[12];
u_char *buffer; u_char *buffer;
unsigned int elem; unsigned int elem;
int result,i; int result,i;
@@ -739,17 +739,18 @@ static long ch_ioctl(struct file *file,
mutex_lock(&ch->lock); mutex_lock(&ch->lock);
voltag_retry: voltag_retry:
memset(cmd,0,sizeof(cmd)); memset(ch_cmd, 0, sizeof(ch_cmd));
cmd[0] = READ_ELEMENT_STATUS; ch_cmd[0] = READ_ELEMENT_STATUS;
cmd[1] = (ch->device->lun << 5) | ch_cmd[1] = (ch->device->lun << 5) |
(ch->voltags ? 0x10 : 0) | (ch->voltags ? 0x10 : 0) |
ch_elem_to_typecode(ch,elem); ch_elem_to_typecode(ch,elem);
cmd[2] = (elem >> 8) & 0xff; ch_cmd[2] = (elem >> 8) & 0xff;
cmd[3] = elem & 0xff; ch_cmd[3] = elem & 0xff;
cmd[5] = 1; ch_cmd[5] = 1;
cmd[9] = 255; ch_cmd[9] = 255;
if (0 == (result = ch_do_scsi(ch, cmd, buffer, 256, DMA_FROM_DEVICE))) { result = ch_do_scsi(ch, ch_cmd, buffer, 256, DMA_FROM_DEVICE);
if (!result) {
cge.cge_status = buffer[18]; cge.cge_status = buffer[18];
cge.cge_flags = 0; cge.cge_flags = 0;
if (buffer[18] & CESTATUS_EXCEPT) { if (buffer[18] & CESTATUS_EXCEPT) {