Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] isci: remove unused 'isci_tmf->device' field

Browse source 
As the field was never set, isci_print_tmf() using 'isci_tmf->device'
sometimes causes a kernel crash if the dev_dbg() statement is enabled.
Remove the unused field both from isci_tmf struct definition and from
isci_print_tmf()

Signed-off-by: Maciej Trela <maciej.trela@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Maciej Trela 2012-01-04 01:33:05 -08:00 committed by James Bottomley
parent be168a3b89
commit 27234ab44f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/isci/task.c
View file

@ -496,7 +496,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
} }
} }
isci_print_tmf(tmf); isci_print_tmf(ihost, tmf);
if (tmf->status == SCI_SUCCESS) if (tmf->status == SCI_SUCCESS)
ret = TMF_RESP_FUNC_COMPLETE; ret = TMF_RESP_FUNC_COMPLETE;

7
drivers/scsi/isci/task.h
View file

@ -106,7 +106,6 @@ struct isci_tmf {
} resp; } resp;
unsigned char lun[8]; unsigned char lun[8];
u16 io_tag; u16 io_tag;
struct isci_remote_device *device;
enum isci_tmf_function_codes tmf_code; enum isci_tmf_function_codes tmf_code;
int status; int status;
@ -120,10 +119,10 @@ struct isci_tmf {
}; };
static inline void isci_print_tmf(struct isci_tmf *tmf) static inline void isci_print_tmf(struct isci_host *ihost, struct isci_tmf *tmf)
{ {
if (SAS_PROTOCOL_SATA == tmf->proto) if (SAS_PROTOCOL_SATA == tmf->proto)
dev_dbg(&tmf->device->isci_port->isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: status = %x\n" "%s: status = %x\n"
"tmf->resp.d2h_fis.status = %x\n" "tmf->resp.d2h_fis.status = %x\n"
"tmf->resp.d2h_fis.error = %x\n", "tmf->resp.d2h_fis.error = %x\n",
@ -132,7 +131,7 @@ static inline void isci_print_tmf(struct isci_tmf *tmf)
tmf->resp.d2h_fis.status, tmf->resp.d2h_fis.status,
tmf->resp.d2h_fis.error); tmf->resp.d2h_fis.error);
else else
dev_dbg(&tmf->device->isci_port->isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: status = %x\n" "%s: status = %x\n"
"tmf->resp.resp_iu.data_present = %x\n" "tmf->resp.resp_iu.data_present = %x\n"
"tmf->resp.resp_iu.status = %x\n" "tmf->resp.resp_iu.status = %x\n"