Commit 7fa3030c authored by Stephen Cameron's avatar Stephen Cameron Committed by James Bottomley

hpsa: do not use a void pointer for scsi_cmd field of struct CommandList

There's no reason for it to be a void *, it should be a struct scsi_cmnd *
Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e345893b
...@@ -1764,7 +1764,7 @@ static void complete_scsi_command(struct CommandList *cp) ...@@ -1764,7 +1764,7 @@ static void complete_scsi_command(struct CommandList *cp)
unsigned long sense_data_size; unsigned long sense_data_size;
ei = cp->err_info; ei = cp->err_info;
cmd = (struct scsi_cmnd *) cp->scsi_cmd; cmd = cp->scsi_cmd;
h = cp->h; h = cp->h;
dev = cmd->device->hostdata; dev = cmd->device->hostdata;
...@@ -4466,7 +4466,7 @@ static int hpsa_send_reset_as_abort_ioaccel2(struct ctlr_info *h, ...@@ -4466,7 +4466,7 @@ static int hpsa_send_reset_as_abort_ioaccel2(struct ctlr_info *h,
unsigned char *psa = &phys_scsi3addr[0]; unsigned char *psa = &phys_scsi3addr[0];
/* Get a pointer to the hpsa logical device. */ /* Get a pointer to the hpsa logical device. */
scmd = (struct scsi_cmnd *) abort->scsi_cmd; scmd = abort->scsi_cmd;
dev = (struct hpsa_scsi_dev_t *)(scmd->device->hostdata); dev = (struct hpsa_scsi_dev_t *)(scmd->device->hostdata);
if (dev == NULL) { if (dev == NULL) {
dev_warn(&h->pdev->dev, dev_warn(&h->pdev->dev,
...@@ -4604,7 +4604,7 @@ static int hpsa_eh_abort_handler(struct scsi_cmnd *sc) ...@@ -4604,7 +4604,7 @@ static int hpsa_eh_abort_handler(struct scsi_cmnd *sc)
} }
hpsa_get_tag(h, abort, &taglower, &tagupper); hpsa_get_tag(h, abort, &taglower, &tagupper);
ml += sprintf(msg+ml, "Tag:0x%08x:%08x ", tagupper, taglower); ml += sprintf(msg+ml, "Tag:0x%08x:%08x ", tagupper, taglower);
as = (struct scsi_cmnd *) abort->scsi_cmd; as = abort->scsi_cmd;
if (as != NULL) if (as != NULL)
ml += sprintf(msg+ml, "Command:0x%x SN:0x%lx ", ml += sprintf(msg+ml, "Command:0x%x SN:0x%lx ",
as->cmnd[0], as->serial_number); as->cmnd[0], as->serial_number);
......
...@@ -408,7 +408,7 @@ struct CommandList { ...@@ -408,7 +408,7 @@ struct CommandList {
int cmd_type; int cmd_type;
long cmdindex; long cmdindex;
struct completion *waiting; struct completion *waiting;
void *scsi_cmd; struct scsi_cmnd *scsi_cmd;
struct work_struct work; struct work_struct work;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment