On Tue, Jan 31, 2017 at 2:55 PM, Hannes Reinecke <h...@suse.de> wrote:
> Just a wrapper around the scsi lookup array and only used
> in one place, so open-code it.
I think this whole series of patches created over 14.101.00.00 version
driver not on the latest 15.100.00.00 driver. So this patch will
conflict with 15.100.00.00 version driver i.e. with commit
459325c466d278d3c9f51ddc9bb544c014136fd1(mpt3sas: Fix for Crusader to
achieve product targets with SAS devices).
Thanks,
Sreekanth
>
> Signed-off-by: Hannes Reinecke <h...@suse.com>
> ---
> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> index b5c966e..979f95a 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> @@ -1061,19 +1061,6 @@ struct _sas_node *
> }
>
> /**
> - * _scsih_scsi_lookup_get - returns scmd entry
> - * @ioc: per adapter object
> - * @smid: system request message index
> - *
> - * Returns the smid stored scmd pointer.
> - */
> -static struct scsi_cmnd *
> -_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc, u16 smid)
> -{
> - return ioc->scsi_lookup[smid - 1].scmd;
> -}
> -
> -/**
> * _scsih_scsi_lookup_get_clear - returns scmd entry
> * @ioc: per adapter object
> * @smid: system request message index
> @@ -6101,7 +6088,7 @@ static inline bool ata_12_16_cmd(struct scsi_cmnd *scmd)
> for (smid = 1; smid <= ioc->scsiio_depth; smid++) {
> if (ioc->shost_recovery)
> goto out;
> - scmd = _scsih_scsi_lookup_get(ioc, smid);
> + scmd = ioc->scsi_lookup[smid - 1].scmd;
> if (!scmd)
> continue;
> sdev = scmd->device;
> --
> 1.8.5.6
>
