From patchwork Wed Oct 18 06:09:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viswas G X-Patchwork-Id: 10013479 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 176C560215 for ; Wed, 18 Oct 2017 06:09:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 087DF27B81 for ; Wed, 18 Oct 2017 06:09:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0C6428AAE; Wed, 18 Oct 2017 06:09:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B7B527B81 for ; Wed, 18 Oct 2017 06:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933668AbdJRGJk (ORCPT ); Wed, 18 Oct 2017 02:09:40 -0400 Received: from mail-co1nam03on0058.outbound.protection.outlook.com ([104.47.40.58]:32263 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933437AbdJRGJf (ORCPT ); Wed, 18 Oct 2017 02:09:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mscc365.onmicrosoft.com; s=selector1-microsemi-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ajXlh1S1ZB2PBB7skKH+GoydopD36fJkihmtnpNDpz8=; b=QCWlStWilmQP0fyYnQdc0ZWvGfKZogsxI70uhiy+35RWly4yig2rrZZu+57BxvNZ0tZk2Cc9WNpfCpk0aiLuZH18nYQKeDAVtsaBYjJd0VuqGl3niZSdueucMu20YhOcbRB7IyCrMnYGgCOntjnzM494Ef9p83wiLivRDXJx800= Received: from BN6PR02CA0081.namprd02.prod.outlook.com (10.161.158.22) by BY2PR0201MB0743.namprd02.prod.outlook.com (10.160.124.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 18 Oct 2017 06:09:32 +0000 Received: from BN1BFFO11FD017.protection.gbl (2a01:111:f400:7c10::1:144) by BN6PR02CA0081.outlook.office365.com (2603:10b6:405:60::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Wed, 18 Oct 2017 06:09:32 +0000 Authentication-Results: spf=pass (sender IP is 208.19.100.21) smtp.mailfrom=microsemi.com; oracle.com; dkim=none (message not signed) header.d=none;oracle.com; dmarc=bestguesspass action=none header.from=microsemi.com; Received-SPF: Pass (protection.outlook.com: domain of microsemi.com designates 208.19.100.21 as permitted sender) receiver=protection.outlook.com; client-ip=208.19.100.21; helo=avsrvexchhts1.microsemi.net; Received: from avsrvexchhts1.microsemi.net (208.19.100.21) by BN1BFFO11FD017.mail.protection.outlook.com (10.58.144.80) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.77.10 via Frontend Transport; Wed, 18 Oct 2017 06:09:31 +0000 Received: from localhost (10.187.72.81) by avsrvexchhts1.microsemi.net (10.100.34.105) with Microsoft SMTP Server id 14.3.361.1; Tue, 17 Oct 2017 23:09:27 -0700 From: Viswas G To: CC: , , , , , Subject: [PATCH V4 5/9] pm80xx : cleanup in pm8001_abort_task function. Date: Wed, 18 Oct 2017 11:39:11 +0530 Message-ID: <20171018060915.8549-6-Viswas.G@microsemi.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20171018060915.8549-1-Viswas.G@microsemi.com> References: <20171018060915.8549-1-Viswas.G@microsemi.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:208.19.100.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(2980300002)(438002)(189002)(199003)(54906003)(5660300001)(77096006)(5003940100001)(86362001)(97736004)(68736007)(69596002)(50986999)(16586007)(478600001)(8676002)(8936002)(2950100002)(106466001)(6666003)(50226002)(6916009)(2351001)(48376002)(1076002)(305945005)(53936002)(81166006)(81156014)(316002)(106002)(104016004)(2906002)(76176999)(76506005)(4326008)(47776003)(189998001)(57986006)(36756003)(50466002)(356003)(15760500002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0201MB0743; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD017; 1:TJCCIxEOQtdCc4Ke0PHIWOkC6vGp6xIElQaFiLO6fg1K2pUi9qhwdYkgjet9r31hCFYHtLVeXbyebTBVrZ7IkIUzFmVd7QkQEBTgSazRkWfoWs1ms6DGzntqdtR7rBUt X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea48eb1c-c4cd-46e4-869a-08d515eeccac X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BY2PR0201MB0743; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0743; 3:LYYH0MZf+i7F/SarkBtim+RlSPAk7Ji8b3jRWlZJyEd1VPyWzOqiV+4Gi+8mwuPCXwgTxO8y4/N92dhM1u1+/Tfqx64DKnktnCrFzNnfhLXhp+ESPOmUT5YMPZY9Kuesx21TMchJqRL8W27EOaduN/sifxozKO4TgSBND14oaYwr5m9khbzeizxtSD3OF/YyzlR3+N+2SkH34HSPRxQ3P79Xe58RRh8/ZyqD0bwbZHB8Kz/zp/4XUS6eM9b6CV5zjCgLJkYIgwUSW5NC+naBDXEEsYPi7OP82EBH4SyzMFD1CyjkW6dChjt7jw8ty4Fnhyld6iGpIkXY7wdBs9rKc3ZJ4aojOiF/vk2uSbjYLwo=; 25:X30BogCn/kCXM2IIf4WohjVpa6ZgUiwT7eLbmFG8Or4HmT1w9UpMtAqt0u+8h56y4NQ1YNnPMoec2TkJrejaS9cPnn3QHWdTg0imyUtxIU53vKCZVhxqLX1YtJcC6p/qkPAroXvUPTiyQ8ACpan+FMyGN/9cz69kXs7/z2ScAn4WBeg6wiWpzbqOOv1Qoo6ZmpuA55SqBc4QOaZx3mQPta9fyX08r0JeeVyu/RpxY691la53j315LKvv2HXQqcvV1yz38MhNRjtZBztIeZhffSY1nb+cUlsSsX7EQQFtC7uZlAzFBpTwBmNbIf3joVNfWYaOENRlRmII7SD5fzapqnES3o2gbjYdlLok79C3J7c= X-MS-TrafficTypeDiagnostic: BY2PR0201MB0743: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0743; 31:tZPsmqoMCkSjl7GOCgokKEjc3Xv6Y8XWK/ryL4aCySg+Ix8puAaH+3ePu10T8gVMyUSgMjixG+VAj/glh487Ls9zo7osCV1NXO3/7j+HZf7mQN+Li/Sj0MSZj1xTZf2V8hYJJMbBQ/wZXEM95pxLL6k6thfW2GiExwaInDWeE+FXPBlLI+0dstTjuzG400jut0VDv/LcS5/BRJwlxYHAjERVC9CejTHSH71ws3IdebU=; 20:XcESlPsuCIwMzR/SSeNRoVTR9baWYM+umyRVVG1a/OaSBm1bFsDAP0Cbs5//UWitlY001D1sCqC8oVbbDZ/jke+C12UlS05p18GggMnbios4g1Ag9P1di0wvuGIMHAr+qmCkJbYYOfzt/aiZ/NenYV4bE4RuN/b6AjMtUTYI2IvYVnIcxbTj37LdOoPzzpSLobP3A9G2FyMZT8OUVxagKQNDmwlHf1d043SqKy3JYn4vBg/lqIJMBwPRADVvDFMwTtgaUyvEN7dYKaRLH6aOCoKXy5LCN6dxct+GoGvsQsGvsa1PmnOZDAdg1aPUbnAgRF2Oam3EkKhpohEfKG5iAdXIGo35g3hrs77QD5vmTVCSmiXnevMSvIN8884bJpsDaS0R5Gopz3jnP712yyfREtpdfdQEaGH++TlpVydqoblZzK0x34/1mWRZtoQN+gDNqiLEnObRAFs65aliCfWMuQfG4QwZif9kh6Eu79UGG1+P9lBZTxSGQZ3QouZkgchg X-Exchange-Antispam-Report-Test: UriScan:(72170198267865); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123564025)(20161123562025)(20161123560025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR0201MB0743; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR0201MB0743; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0743; 4:sB94sGA0vVRXF3cJ64AQWrj57hNFg5WALh4rEZVumxueaX8rET6Vy++mXEilJgJb10qBTFUWRwlTffWsr8iOtNvGWp7fUTGBlWasS9a9BFuFagvdrINuLokaSnOofLiytDxhgKkTZ7rx3qcdo/nxOwTXWHU+F4CFUrk5Cm1xyxzr+dk7kuvrVAYyvVTlXpNZbuQFQSi+DGQXrdYcQzfis/ZNpgDmbrHIpDLElRbCh3UyiuptvRnhMaPzHgf9z7JAJbpZfRs9JN77XnWU+sF2StSJv5Q7lGmLG5zfByDXm24= X-Forefront-PRVS: 0464DBBBC4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0201MB0743; 23:NiddPqzrEskqdGlBnPlYdnd9CXhpPpAgt9xuz4p?= =?us-ascii?Q?RNN0bDYeKW7KAaOPM5q9wsWVSza4qhiSWeDY5RuL5Dy9XkkcVAo0pS0FdKjJ?= =?us-ascii?Q?N7WUaQKppufxyXqP49QFq9LY6/0zZR/mbw8j362wt81vT4gpUr3vj7fBLmk3?= =?us-ascii?Q?/oqtM+bbxmQE8MAmkHn3amUtR7Dc8m528SoFi1WuXursclnqQP/y2qM16uSq?= =?us-ascii?Q?IX3n4AerQglsaiu+ab0CTz8c3Rcbrc3RpCCCgzrhApfbXblcPjkfVbS/8e89?= =?us-ascii?Q?2Khqu6vG3PQ48E1Wmf2VS2ZQwWlw4BkP207hoxYQetpmUWgEDjlmSy9CczWv?= =?us-ascii?Q?7RgRHT0QlPo8YE9wbTeXCi6jwrOl1iV0BxZoAdmi7FaW9vmPaZT/SDZgkAJC?= =?us-ascii?Q?vozGJf0L9SE8Q+mlyui3I/2owiDMxhCG06sgFyHIb6RSeS8G3M4uiU+m/azs?= =?us-ascii?Q?vpbtH+OGMm58OZGcUXlJEb3WpHReB7RrtTqZ6JJSCsJR+cmapnzFBUIuc7xx?= =?us-ascii?Q?7VOAvauaeFDfwMom7v1yZzI8xKLOtCy8syP9Tfwqqjc0+PlHhZKMbCd193CU?= =?us-ascii?Q?5qf24PknMyvBZQIUEkC21cfyuCkopgcTatjvrrybqoFHEQvZQLo59vdFWxe8?= =?us-ascii?Q?vgD+lz1hl6gv/HC1Lav1q0ZAgtM4YD5uahU2z28dRRwM8Jzee+WmbzxcxbOr?= =?us-ascii?Q?alsviWmBDiA5r1i4rnMAwn7eSH4fExZCnmwsTJsGZ6TMhB8j3IJoD4waKT71?= =?us-ascii?Q?ag7n0jXxM5bruABfdRC5bpSgM5qsS6mNLLto4l4nIFy9IQHBWH0myqLyx8UE?= =?us-ascii?Q?266MqQUDZGGQRxfjUpg/E9wR9MXVARWDA8dolEHYH5OLO5o9GhC4oNL+NZnc?= =?us-ascii?Q?6YBf+CAyqXMkse7ijcoR2GMOpgWNnGJ83DOXx8MPoV4b5L0ASPMpPicL15q3?= =?us-ascii?Q?5SX4mQwjkP7Lf7kJT8FICBpO3RIgpakCHGCFt+4axDnAmmrTeXwxQiki9/hp?= =?us-ascii?Q?EzbLWsptRLw4wn1zNRAZoAbcBnb5uutXOFzx8+pADg6vhQOoXtG3Jc0CDTxy?= =?us-ascii?Q?rIl8ifgo+ci+25oTkVEu1zbRfXI1tGi2bS5Z23KDX4kNH3ELOWZcS6a6jwWe?= =?us-ascii?Q?OFw0sRBYX2Y8=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0743; 6:7oO6ETVitOrGyqAbx3gGPbo6o+nLHHcKWHZMBCK0aT4qVgSOfAGFlAHv2EoBiAMEHjaPH8u2etdygx6c7GdpKhQ6cdgEdDOHY/3PTf8/TENKRwoizt8g2jBRvQXLUmiahcFZDipCg0QvtyoxQsuZJx80QotayoRE4GuXn+eq3IppiQ7+jpKOPymFMvnTIVLI+YBPPCK69W9H7+Uh5leNuDDILgo6NIP/pPIG9uEej520Q2BV9YgYMUwGe13Z9rhpXEiMzpDcno7aMG5YBYKQ/Dynli2z7SAFgNuuvgQqMJzQUk8Gy5whTqFntErdgr+hy/PFYn2ydCv3UFhZ3Ym+Pg==; 5:rI/64t7BzZfmmC2e/Tz6xSiai7IurJh+ToQp2pANMg9Fbha+Vxo7b+7aF0xjajhQ4cHE6/CIoqWlmJWORWP+mPQlBe8QxoKWeV1ul3FbAtBpNMdi4ALuCyVPnCHer94A7J5QWpTsEcX3NxyHcJWkpg==; 24:H8uFsoaavL4BzjbdheDt4NN/3YkVbQ2euEmsIlBQFmUfraDm9CPYDPlMBvJbqNFojNw/gtZ+bwQMDOkpoh3GivMbrDg58u+g07k0gN0d1X8=; 7:JdPpQnAiH0SLYOLvkkMEPxkbPSfWtqgZwqdW0fsYaH14FKj9L3+ZJDK0W/htIGSLlaEsPr9/h7bOyAZT03dLxk8ZbisudMVBb7P0smXqJDtwRtLTB1ty914Pyd+Yb5Di1SJM4pJWSwqJNEWfOyFOK0jf+Qb23LMTAX2CNGtf6sCLwrWORs9a9BzP4Cf9kTuYP7AdZT+qDfMMLC/ed/ZxO+Jtq9vrS45vcIrCXnjBc/c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2017 06:09:31.9619 (UTC) X-MS-Exchange-CrossTenant-Id: f267a5c8-86d8-4cc9-af71-1fd2c67c8fad X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f267a5c8-86d8-4cc9-af71-1fd2c67c8fad; Ip=[208.19.100.21]; Helo=[avsrvexchhts1.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0201MB0743 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP v4: -Removed the unused variable ccb in pm8001_abort_task. -Removed the unused label out which is not used Signed-off-by: Deepak Ukey Signed-off-by: Viswas G Acked-by: Jack Wang --- drivers/scsi/pm8001/pm8001_sas.c | 51 ++++++++++------------------------------ 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index ce584c31d36e..a7626a851b62 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -1159,40 +1159,34 @@ int pm8001_query_task(struct sas_task *task) int pm8001_abort_task(struct sas_task *task) { unsigned long flags; - u32 tag = 0xdeadbeef; + u32 tag; u32 device_id; struct domain_device *dev ; - struct pm8001_hba_info *pm8001_ha = NULL; - struct pm8001_ccb_info *ccb; + struct pm8001_hba_info *pm8001_ha; struct scsi_lun lun; struct pm8001_device *pm8001_dev; struct pm8001_tmf_task tmf_task; int rc = TMF_RESP_FUNC_FAILED; if (unlikely(!task || !task->lldd_task || !task->dev)) - return rc; + return TMF_RESP_FUNC_FAILED; + dev = task->dev; + pm8001_dev = dev->lldd_dev; + pm8001_ha = pm8001_find_ha_by_dev(dev); + device_id = pm8001_dev->device_id; + rc = pm8001_find_tag(task, &tag); + if (rc == 0) { + pm8001_printk("no tag for task:%p\n", task); + return TMF_RESP_FUNC_FAILED; + } spin_lock_irqsave(&task->task_state_lock, flags); if (task->task_state_flags & SAS_TASK_STATE_DONE) { spin_unlock_irqrestore(&task->task_state_lock, flags); - rc = TMF_RESP_FUNC_COMPLETE; - goto out; + return TMF_RESP_FUNC_COMPLETE; } spin_unlock_irqrestore(&task->task_state_lock, flags); if (task->task_proto & SAS_PROTOCOL_SSP) { struct scsi_cmnd *cmnd = task->uldd_task; - dev = task->dev; - ccb = task->lldd_task; - pm8001_dev = dev->lldd_dev; - pm8001_ha = pm8001_find_ha_by_dev(dev); int_to_scsilun(cmnd->device->lun, &lun); - rc = pm8001_find_tag(task, &tag); - if (rc == 0) { - printk(KERN_INFO "No such tag in %s\n", __func__); - rc = TMF_RESP_FUNC_FAILED; - return rc; - } - device_id = pm8001_dev->device_id; - PM8001_EH_DBG(pm8001_ha, - pm8001_printk("abort io to deviceid= %d\n", device_id)); tmf_task.tmf = TMF_ABORT_TASK; tmf_task.tag_of_task_to_be_managed = tag; rc = pm8001_issue_ssp_tmf(dev, lun.scsi_lun, &tmf_task); @@ -1200,33 +1194,14 @@ int pm8001_abort_task(struct sas_task *task) pm8001_dev->sas_device, 0, tag); } else if (task->task_proto & SAS_PROTOCOL_SATA || task->task_proto & SAS_PROTOCOL_STP) { - dev = task->dev; - pm8001_dev = dev->lldd_dev; - pm8001_ha = pm8001_find_ha_by_dev(dev); - rc = pm8001_find_tag(task, &tag); - if (rc == 0) { - printk(KERN_INFO "No such tag in %s\n", __func__); - rc = TMF_RESP_FUNC_FAILED; - return rc; - } rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev, pm8001_dev->sas_device, 0, tag); } else if (task->task_proto & SAS_PROTOCOL_SMP) { /* SMP */ - dev = task->dev; - pm8001_dev = dev->lldd_dev; - pm8001_ha = pm8001_find_ha_by_dev(dev); - rc = pm8001_find_tag(task, &tag); - if (rc == 0) { - printk(KERN_INFO "No such tag in %s\n", __func__); - rc = TMF_RESP_FUNC_FAILED; - return rc; - } rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev, pm8001_dev->sas_device, 0, tag); } -out: if (rc != TMF_RESP_FUNC_COMPLETE) pm8001_printk("rc= %d\n", rc); return rc;