From 8a3ee9dc00bd022a4fdff6a70afbf81384aff4fe Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 12 Dec 2012 02:26:51 +0530 Subject: [PATCH] --- yaml --- r: 359439 b: refs/heads/master c: 25ef16d0710e1d2476bb06232836650ea42763a5 h: refs/heads/master i: 359437: defae8ba2a24072222e92403e2ff5727e7bbb965 359435: eb648ca7fa050aa474d2311750457e1d586d50d4 359431: 6a954ac55a9e748a5cc29482549fc546b34b7916 359423: afe6e6d0034aeffacd487b0093c9937658635232 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +--- trunk/drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 523391701e62..049470aa7a97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3735660d7be66e2e508ff393f69214f2b4113ab2 +refs/heads/master: 25ef16d0710e1d2476bb06232836650ea42763a5 diff --git a/trunk/drivers/scsi/mpt3sas/mpt3sas_base.c b/trunk/drivers/scsi/mpt3sas/mpt3sas_base.c index d5e8463edeeb..18360032a520 100644 --- a/trunk/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/trunk/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -1309,7 +1309,6 @@ _base_build_sg_scmd_ieee(struct MPT3SAS_ADAPTER *ioc, void *sg_local, *chain; u32 chain_offset; u32 chain_length; - u32 chain_flags; int sges_left; u32 sges_in_segment; u8 simple_sgl_flags; @@ -1355,8 +1354,7 @@ _base_build_sg_scmd_ieee(struct MPT3SAS_ADAPTER *ioc, sges_in_segment--; } - /* initializing the chain flags and pointers */ - chain_flags = MPI2_SGE_FLAGS_CHAIN_ELEMENT << MPI2_SGE_FLAGS_SHIFT; + /* initializing the pointers */ chain_req = _base_get_chain_buffer_tracker(ioc, smid); if (!chain_req) return -1; diff --git a/trunk/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/trunk/drivers/scsi/mpt3sas/mpt3sas_scsih.c index eb23846dc529..dcbf7c880cb2 100644 --- a/trunk/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/trunk/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -2754,13 +2754,11 @@ _scsih_block_io_to_children_attached_directly(struct MPT3SAS_ADAPTER *ioc, int i; u16 handle; u16 reason_code; - u8 phy_number; for (i = 0; i < event_data->NumEntries; i++) { handle = le16_to_cpu(event_data->PHY[i].AttachedDevHandle); if (!handle) continue; - phy_number = event_data->StartPhyNum + i; reason_code = event_data->PHY[i].PhyStatus & MPI2_EVENT_SAS_TOPO_RC_MASK; if (reason_code == MPI2_EVENT_SAS_TOPO_RC_DELAY_NOT_RESPONDING)