UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: mpt3sas: Remove set-but-not-used variables 

This patch does not change any functionality.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Chaitra P B <chaitra.basappa@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2018-06-15 14:41:55 -07:00 committed by Martin K. Petersen
parent 199fd79a11
commit 7d1207288f
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/mpt3sas/mpt3sas_base.c
View File

@ -2155,11 +2155,9 @@ base_is_prp_possible(struct MPT3SAS_ADAPTER *ioc,
struct _pcie_device *pcie_device, struct scsi_cmnd *scmd, int sge_count) struct _pcie_device *pcie_device, struct scsi_cmnd *scmd, int sge_count)
{ {
u32 data_length = 0; u32 data_length = 0;
struct scatterlist *sg_scmd;
bool build_prp = true; bool build_prp = true;
data_length = scsi_bufflen(scmd); data_length = scsi_bufflen(scmd);
sg_scmd = scsi_sglist(scmd);
/* If Datalenth is <= 16K and number of SGE’s entries are <= 2 /* If Datalenth is <= 16K and number of SGE’s entries are <= 2
* we built IEEE SGL * we built IEEE SGL
@ -2190,11 +2188,9 @@ _base_check_pcie_native_sgl(struct MPT3SAS_ADAPTER *ioc,
Mpi25SCSIIORequest_t *mpi_request, u16 smid, struct scsi_cmnd *scmd, Mpi25SCSIIORequest_t *mpi_request, u16 smid, struct scsi_cmnd *scmd,
struct _pcie_device *pcie_device) struct _pcie_device *pcie_device)
{ {
struct scatterlist *sg_scmd;
int sges_left; int sges_left;
/* Get the SG list pointer and info. */ /* Get the SG list pointer and info. */
sg_scmd = scsi_sglist(scmd);
sges_left = scsi_dma_map(scmd); sges_left = scsi_dma_map(scmd);
if (sges_left < 0) { if (sges_left < 0) {
sdev_printk(KERN_ERR, scmd->device, sdev_printk(KERN_ERR, scmd->device,
@ -3498,11 +3494,8 @@ mpt3sas_base_put_smid_hi_priority(struct MPT3SAS_ADAPTER *ioc, u16 smid,
u64 *request; u64 *request;
if (ioc->is_mcpu_endpoint) { if (ioc->is_mcpu_endpoint) {
MPI2RequestHeader_t *request_hdr;
__le32 *mfp = (__le32 *)mpt3sas_base_get_msg_frame(ioc, smid); __le32 *mfp = (__le32 *)mpt3sas_base_get_msg_frame(ioc, smid);
request_hdr = (MPI2RequestHeader_t *)mfp;
/* TBD 256 is offset within sys register. */ /* TBD 256 is offset within sys register. */
mpi_req_iomem = (void __force *)ioc->chip mpi_req_iomem = (void __force *)ioc->chip
+ MPI_FRAME_START_OFFSET + MPI_FRAME_START_OFFSET
@ -3565,13 +3558,10 @@ mpt3sas_base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid)
Mpi2RequestDescriptorUnion_t descriptor; Mpi2RequestDescriptorUnion_t descriptor;
void *mpi_req_iomem; void *mpi_req_iomem;
u64 *request; u64 *request;
MPI2RequestHeader_t *request_hdr;
if (ioc->is_mcpu_endpoint) { if (ioc->is_mcpu_endpoint) {
__le32 *mfp = (__le32 *)mpt3sas_base_get_msg_frame(ioc, smid); __le32 *mfp = (__le32 *)mpt3sas_base_get_msg_frame(ioc, smid);
request_hdr = (MPI2RequestHeader_t *)mfp;
_clone_sg_entries(ioc, (void *) mfp, smid); _clone_sg_entries(ioc, (void *) mfp, smid);
/* TBD 256 is offset within sys register */ /* TBD 256 is offset within sys register */
mpi_req_iomem = (void __force *)ioc->chip + mpi_req_iomem = (void __force *)ioc->chip +

5
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View File

@ -1653,7 +1653,6 @@ scsih_target_destroy(struct scsi_target *starget)
struct _raid_device *raid_device; struct _raid_device *raid_device;
struct _pcie_device *pcie_device; struct _pcie_device *pcie_device;
unsigned long flags; unsigned long flags;
struct sas_rphy *rphy;
sas_target_priv_data = starget->hostdata; sas_target_priv_data = starget->hostdata;
if (!sas_target_priv_data) if (!sas_target_priv_data)
@ -1693,7 +1692,6 @@ scsih_target_destroy(struct scsi_target *starget)
} }
spin_lock_irqsave(&ioc->sas_device_lock, flags); spin_lock_irqsave(&ioc->sas_device_lock, flags);
rphy = dev_to_rphy(starget->dev.parent);
sas_device = __mpt3sas_get_sdev_from_target(ioc, sas_target_priv_data); sas_device = __mpt3sas_get_sdev_from_target(ioc, sas_target_priv_data);
if (sas_device && (sas_device->starget == starget) && if (sas_device && (sas_device->starget == starget) &&
(sas_device->id == starget->id) && (sas_device->id == starget->id) &&
@ -6872,7 +6870,6 @@ _scsih_pcie_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle)
Mpi2ConfigReply_t mpi_reply; Mpi2ConfigReply_t mpi_reply;
struct _pcie_device *pcie_device; struct _pcie_device *pcie_device;
struct _enclosure_node *enclosure_dev; struct _enclosure_node *enclosure_dev;
u32 pcie_device_type;
u32 ioc_status; u32 ioc_status;
u64 wwid; u64 wwid;
@ -6934,8 +6931,6 @@ _scsih_pcie_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle)
pcie_device->port_num = pcie_device_pg0.PortNum; pcie_device->port_num = pcie_device_pg0.PortNum;
pcie_device->fast_path = (le32_to_cpu(pcie_device_pg0.Flags) & pcie_device->fast_path = (le32_to_cpu(pcie_device_pg0.Flags) &
MPI26_PCIEDEV0_FLAGS_FAST_PATH_CAPABLE) ? 1 : 0; MPI26_PCIEDEV0_FLAGS_FAST_PATH_CAPABLE) ? 1 : 0;
pcie_device_type = pcie_device->device_info &
MPI26_PCIE_DEVINFO_MASK_DEVICE_TYPE;
pcie_device->enclosure_handle = pcie_device->enclosure_handle =
le16_to_cpu(pcie_device_pg0.EnclosureHandle); le16_to_cpu(pcie_device_pg0.EnclosureHandle);