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

Commit 2e45c8b7 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Christoph Hellwig
Browse files

mpt2sas: Remove uses of serial_number 



The mpt2sas_scsih_issue_tm() function does not use the 'serial_number'
argument passed to it.  Removing it removes the last vestiges of the
scsi_cmnd's serial_number field from this driver.

Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
Reviewed-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Reviewed-by: default avatarPraveen Krishnamoorthy <Praveen.krishnamoorthy@lsi.com>
Acked-by: default avatarSreekanth Reddy <Sreekanth.reddy@lsi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d8bfbd8d

drivers/scsi/mpt2sas/mpt2sas_base.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1065,7 +1065,7 @@ void mpt2sas_scsih_event_callback(struct MPT2SAS_ADAPTER *ioc, u8 msix_index, 
    u32 reply);

    u32 reply);

int mpt2sas_scsih_issue_tm(struct MPT2SAS_ADAPTER *ioc, u16 handle,

int mpt2sas_scsih_issue_tm(struct MPT2SAS_ADAPTER *ioc, u16 handle,

	uint channel, uint id, uint lun, u8 type, u16 smid_task,

	uint channel, uint id, uint lun, u8 type, u16 smid_task,

	ulong timeout, unsigned long serial_number, enum mutex_type m_type);

	ulong timeout, enum mutex_type m_type);

void mpt2sas_scsih_set_tm_flag(struct MPT2SAS_ADAPTER *ioc, u16 handle);

void mpt2sas_scsih_set_tm_flag(struct MPT2SAS_ADAPTER *ioc, u16 handle);

void mpt2sas_scsih_clear_tm_flag(struct MPT2SAS_ADAPTER *ioc, u16 handle);

void mpt2sas_scsih_clear_tm_flag(struct MPT2SAS_ADAPTER *ioc, u16 handle);

void mpt2sas_expander_remove(struct MPT2SAS_ADAPTER *ioc, u64 sas_address);

void mpt2sas_expander_remove(struct MPT2SAS_ADAPTER *ioc, u64 sas_address);

drivers/scsi/mpt2sas/mpt2sas_ctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -987,7 +987,7 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc, struct mpt2_ioctl_command karg, 
			mpt2sas_scsih_issue_tm(ioc,

			mpt2sas_scsih_issue_tm(ioc,

			    le16_to_cpu(mpi_request->FunctionDependent1), 0, 0,

			    le16_to_cpu(mpi_request->FunctionDependent1), 0, 0,

			    0, MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET, 0, 10,

			    0, MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET, 0, 10,

			    0, TM_MUTEX_ON);

			    TM_MUTEX_ON);

			ioc->tm_cmds.status = MPT2_CMD_NOT_USED;

			ioc->tm_cmds.status = MPT2_CMD_NOT_USED;

		} else

		} else

			mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP,

			mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP,

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -2368,7 +2368,6 @@ mpt2sas_scsih_clear_tm_flag(struct MPT2SAS_ADAPTER *ioc, u16 handle) 
 * @type: MPI2_SCSITASKMGMT_TASKTYPE__XXX (defined in mpi2_init.h)

 * @type: MPI2_SCSITASKMGMT_TASKTYPE__XXX (defined in mpi2_init.h)

 * @smid_task: smid assigned to the task

 * @smid_task: smid assigned to the task

 * @timeout: timeout in seconds

 * @timeout: timeout in seconds

 * @serial_number: the serial_number from scmd

 * @m_type: TM_MUTEX_ON or TM_MUTEX_OFF

 * @m_type: TM_MUTEX_ON or TM_MUTEX_OFF

 * Context: user

 * Context: user

 *

 *
@@ -2381,7 +2380,7 @@ mpt2sas_scsih_clear_tm_flag(struct MPT2SAS_ADAPTER *ioc, u16 handle) 
int

int

mpt2sas_scsih_issue_tm(struct MPT2SAS_ADAPTER *ioc, u16 handle, uint channel,

mpt2sas_scsih_issue_tm(struct MPT2SAS_ADAPTER *ioc, u16 handle, uint channel,

    uint id, uint lun, u8 type, u16 smid_task, ulong timeout,

    uint id, uint lun, u8 type, u16 smid_task, ulong timeout,

	unsigned long serial_number, enum mutex_type m_type)

	enum mutex_type m_type)

{

{

	Mpi2SCSITaskManagementRequest_t *mpi_request;

	Mpi2SCSITaskManagementRequest_t *mpi_request;

	Mpi2SCSITaskManagementReply_t *mpi_reply;

	Mpi2SCSITaskManagementReply_t *mpi_reply;
@@ -2634,8 +2633,7 @@ _scsih_abort(struct scsi_cmnd *scmd) 
	handle = sas_device_priv_data->sas_target->handle;

	handle = sas_device_priv_data->sas_target->handle;

	r = mpt2sas_scsih_issue_tm(ioc, handle, scmd->device->channel,

	r = mpt2sas_scsih_issue_tm(ioc, handle, scmd->device->channel,

	    scmd->device->id, scmd->device->lun,

	    scmd->device->id, scmd->device->lun,

	    MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK, smid, 30,

	    MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK, smid, 30, TM_MUTEX_ON);

	    scmd->serial_number, TM_MUTEX_ON);





 out:

 out:

	sdev_printk(KERN_INFO, scmd->device, "task abort: %s scmd(%p)\n",

	sdev_printk(KERN_INFO, scmd->device, "task abort: %s scmd(%p)\n",
@@ -2696,8 +2694,7 @@ _scsih_dev_reset(struct scsi_cmnd *scmd) 




	r = mpt2sas_scsih_issue_tm(ioc, handle, scmd->device->channel,

	r = mpt2sas_scsih_issue_tm(ioc, handle, scmd->device->channel,

	    scmd->device->id, scmd->device->lun,

	    scmd->device->id, scmd->device->lun,

	    MPI2_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET, 0, 30, 0,

	    MPI2_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET, 0, 30, TM_MUTEX_ON);

	    TM_MUTEX_ON);





 out:

 out:

	sdev_printk(KERN_INFO, scmd->device, "device reset: %s scmd(%p)\n",

	sdev_printk(KERN_INFO, scmd->device, "device reset: %s scmd(%p)\n",
@@ -2757,7 +2754,7 @@ _scsih_target_reset(struct scsi_cmnd *scmd) 




	r = mpt2sas_scsih_issue_tm(ioc, handle, scmd->device->channel,

	r = mpt2sas_scsih_issue_tm(ioc, handle, scmd->device->channel,

	    scmd->device->id, 0, MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET, 0,

	    scmd->device->id, 0, MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET, 0,

	    30, 0, TM_MUTEX_ON);

	    30, TM_MUTEX_ON);





 out:

 out:

	starget_printk(KERN_INFO, starget, "target reset: %s scmd(%p)\n",

	starget_printk(KERN_INFO, starget, "target reset: %s scmd(%p)\n",
@@ -5880,7 +5877,7 @@ _scsih_sas_broadcast_primitive_event(struct MPT2SAS_ADAPTER *ioc, 




		spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);

		spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);

		r = mpt2sas_scsih_issue_tm(ioc, handle, 0, 0, lun,

		r = mpt2sas_scsih_issue_tm(ioc, handle, 0, 0, lun,

		    MPI2_SCSITASKMGMT_TASKTYPE_QUERY_TASK, smid, 30, 0,

		    MPI2_SCSITASKMGMT_TASKTYPE_QUERY_TASK, smid, 30,

		    TM_MUTEX_OFF);

		    TM_MUTEX_OFF);

		if (r == FAILED) {

		if (r == FAILED) {

			sdev_printk(KERN_WARNING, sdev,

			sdev_printk(KERN_WARNING, sdev,
@@ -5922,7 +5919,7 @@ _scsih_sas_broadcast_primitive_event(struct MPT2SAS_ADAPTER *ioc, 




		r = mpt2sas_scsih_issue_tm(ioc, handle, sdev->channel, sdev->id,

		r = mpt2sas_scsih_issue_tm(ioc, handle, sdev->channel, sdev->id,

		    sdev->lun, MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK, smid, 30,

		    sdev->lun, MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK, smid, 30,

		    scmd->serial_number, TM_MUTEX_OFF);

		    TM_MUTEX_OFF);

		if (r == FAILED) {

		if (r == FAILED) {

			sdev_printk(KERN_WARNING, sdev,

			sdev_printk(KERN_WARNING, sdev,

			    "mpt2sas_scsih_issue_tm: ABORT_TASK: FAILED : "

			    "mpt2sas_scsih_issue_tm: ABORT_TASK: FAILED : "