Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27234ab4 authored by Maciej Trela's avatar Maciej Trela Committed by James Bottomley
Browse files

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



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: default avatarMaciej Trela <maciej.trela@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent be168a3b

drivers/scsi/isci/task.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

		ret =  TMF_RESP_FUNC_COMPLETE;

drivers/scsi/isci/task.h

+3 −4
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ struct isci_tmf { 
	} resp;

	unsigned char lun[8];

	u16 io_tag;

	struct isci_remote_device *device;

	enum isci_tmf_function_codes tmf_code;

	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)

		dev_dbg(&tmf->device->isci_port->isci_host->pdev->dev,

		dev_dbg(&ihost->pdev->dev,

			"%s: status = %x\n"

			"tmf->resp.d2h_fis.status = %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.error);

	else

		dev_dbg(&tmf->device->isci_port->isci_host->pdev->dev,

		dev_dbg(&ihost->pdev->dev,

			"%s: status = %x\n"

			"tmf->resp.resp_iu.data_present = %x\n"

			"tmf->resp.resp_iu.status = %x\n"