From patchwork Wed Aug 23 22:05:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9918501 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 0B074600C5 for ; Wed, 23 Aug 2017 22:05:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F015B28A39 for ; Wed, 23 Aug 2017 22:05:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E370128A74; Wed, 23 Aug 2017 22:05:55 +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 8013E28A39 for ; Wed, 23 Aug 2017 22:05:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751183AbdHWWFy (ORCPT ); Wed, 23 Aug 2017 18:05:54 -0400 Received: from mail-dm3nam03on0054.outbound.protection.outlook.com ([104.47.41.54]:10176 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751093AbdHWWFv (ORCPT ); Wed, 23 Aug 2017 18:05:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=XqhKU5nM9K7szu0cYegWxbhb2HdRhGICKp/LAzue2s8=; b=jV3LjyYiEUK7VoGKopB438reI6W1G0x+LP8cOcHxbkImhKDhoj+AV3vTLwcrVHnfbdghRI/rMd9CzXlDkD4T1MeDvO8PfQ9h3BJsjSqiWdRFFc+sZdDIMHL5Upt8tRfmCn/89E95g3jyUTWXJ6bxQl19dj/9GgxlrzQJLVIHxFI= Received: from DM5PR07CA0046.namprd07.prod.outlook.com (10.168.109.32) by CY1PR0701MB1948.namprd07.prod.outlook.com (10.163.141.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Wed, 23 Aug 2017 22:05:48 +0000 Received: from BL2FFO11FD037.protection.gbl (2a01:111:f400:7c09::189) by DM5PR07CA0046.outlook.office365.com (2603:10b6:3:16::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18 via Frontend Transport; Wed, 23 Aug 2017 22:05:48 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD037.mail.protection.outlook.com (10.173.161.133) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 22:05:48 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Wed, 23 Aug 2017 15:05:27 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id v7NM5RdC003210; Wed, 23 Aug 2017 15:05:27 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v7NM5Rfj003209; Wed, 23 Aug 2017 15:05:27 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 15/31] qla2xxx: Use sp->free instead of hard coded call. Date: Wed, 23 Aug 2017 15:05:09 -0700 Message-ID: <20170823220525.3115-16-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170823220525.3115-1-himanshu.madhani@cavium.com> References: <20170823220525.3115-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(50466002)(5003940100001)(2906002)(5660300001)(47776003)(86362001)(2950100002)(33646002)(81156014)(106466001)(8676002)(81166006)(8936002)(76176999)(69596002)(80596001)(54906002)(36756003)(50226002)(42186005)(48376002)(105586002)(1076002)(626005)(478600001)(87636003)(356003)(305945005)(101416001)(50986999)(72206003)(6666003)(4326008)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB1948; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD037; 1:/lE2VPQ2ol1t8v2mPlBTwnp+412I+ExMeHiao/iHoMElOAeDKtddrcRssugWljEOExFMAW/HUuPE/m8AZnyj30f7xebIUK/JwTpepidtRf/bfzheb1pig00QOS1ekRLq X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c8f59fab-999e-4f46-9885-08d4ea731c6e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603190)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR0701MB1948; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1948; 3:woBDlc0Ex+x36B2TPH4jytTP7bpoDoRPpE+cuwURxbYfbNpa82a32beBvJ/IB9d8IV90ZofutmlHLYBwejO6eansg26ktiKyYW6EtGBtp0maqWqCUycv9S22e8GNbdNdOUYMWGLGtvVcOio66Ij94h9TZ+vjdqhNBtTNhwawkx8g49TpwTC0tQnfDa9Ub3yOjDZaWcDX/8irrVkgK8aWGDV/zD2f20WM2IxEQ1hbJtqfQHYZnRcM/Jx5ApbOV+R5IbohxkAnR4T7bHkOkhmxibqerQDED4u/ZbGQrzVJUZuB5uR/6t0wx6co2l0NO4mNANl8QS2bm4e83TP1QbvXHw==; 25:PfzVyZQ02KqbA/8/q+6FpyLBoTKezUNTft3E0zhYae7LaL0fzZiigdUfxoVaXYJqHFh3OXyMYTPjEqp/eYxk0/MTmJEcnHZ5BZF9R20omJ6dVjxQ3W0QoehN7dRdSl6MdI6BSh//BYwgeE2OS3uHXV3KlG9VlrO/Kn/9RscO84rWH36HyOBWUe1+JSxgwPPSwJvYc7h8tCDmJ97+msXjaxajxMe2XN5Fr1zBkMYL/oIOyV6lJ6Nt0/yBhd+tv1RV9ug6EFgnlK/9eobxyXepm2FVR4n2+/Pqa1PS26DoiHyiQlv8OsDtOYUAFGN5mZuPRd44eWjfZzEbC5+E4KZpog==; 31:+sTiPx13sOkwRxaUshS0ubYBhkEI+mQw2Mm4L5RsDJYHwS6o0aSkhFm093Kgdbm7rXolc+t4pugfqbO7EpGixSW8XBUrJMV1nujsoCeTvWHwzO+6a+g/IOdsEwX3bCUheFsfPiW7a00GCFYut5+dQ3e7EwKdMRiBIbshDhKhOywqpkmNXySPRftMim8OSs5U6xBnNcXQeUI/1oWolBdVMc1tYLyLHbqljyj0qD0wxHA= X-MS-TrafficTypeDiagnostic: CY1PR0701MB1948: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1948; 20:tMcr49rAe1/9utSJmBijVVLx3F6xqLqOHvSV8vUJOLc3nPjaoBxX8Eg/PdAaFs82qx0ALdOHO+647R+HtMUAVu8v3nkEEJBv6hivQXskPgufuWgiYIQdw+Nbz+1/lP0SldwyhfCmV7jC88LoEAcU6F72L1fJfYWPWaBw4Ik3FAJuV9j1xxV40Lk1Y3ZtFAmyw5gv2byape4OJRBtcO7fpHtuvlNOoeeeqI+Eyr+7v3EUWV6G2gpBQMAirbRDACFZgjNeYlOdmfkopfiprf9r7bnA5xIUevPLR6qUvh4JlNzQaopVzUQ/m0C1u/YcfMPCGJ8SWVgjqVqcJvDFdce8xHFO+I/M04L5CsL7fKASyHXrW3VEMpRCO8rcB6An1/xI2/WJ3w06MomrdD90/fCBNGc3/B6Vz8HnrrwppH2HiHfvu1KgXymEr/BnuvdTO+zHLuCHMStJ/B5SrVF5yS95BpuM6fJTReLx5T8Rs7EomuMobgmdlx4IitbAyYUZM4L/; 4:8PtdIbn75wt/XW0pF5KtKs6V/bp360rtKOpVZCXaEJTIGHz79aGAn0Agxqzvzy+5dstK8npSt3gyfqJDsOiiWjQLm/YOYpm0js2wAf999EwQpauuHSCgijreVA23LOD/uycesRXSBXIrSzo8+LoyhXhKrO973HJWSBwNemX4pckmBF8/V02qthuvL4aoZwbBJjZ5VrwfAMS2NYk0P9tXlNI+WyUXCHpchpud0mumC8Rzh06kETHSLh6owZjUixur X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13018025)(13016025)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(6041248)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR0701MB1948; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR0701MB1948; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1948; 23:l4Q4fTrFMYghnJh8S85qQzyxH1VBMh5ZwAJeajwBxzcMDIOMGSSCHOBu9tOV0PePe3Yl6jeRmAVSAvYxk/pmRK0pe4i1j7Kj3cBvx3xfWjOzwuuVO6JyxD34f1hGklytIoTHF0NnXU+TVs26BT+wOu1EDQqJmUkj/2fnEGPmyEWbr+tNZeWTejToWEhwQHuGPGAhXDiKEcfCCKL174+ppNt9Kei8JmzMbk5rSVcHtj55C4nopNNXxp5fcuYuoD7w28WUx22HZjrPbafDRFfNLSbOf11ePqsyaExecFPwwJgn/f4S22J6mx40rHSPkoySVEx2h/Nh1yKriwRSmtDxjiP+2pQtkw0S7eOkGZ5I5XBzyBcma5xoKTN4VAzAS4HdT+4FZAV761HhOEiRRtoAubl2QMSdBZ/r7DBMVARoUelboUeIS1BNnvgfuuwtEBCqInLmfdMwfCqISSP16Mon8heoCX0XHwrgaiNZ5roilhzbsJZIZZAuIL1B8JUjWPozWDZgI6GbgIDzjiIGeRDqWItllYTF+6sTfvZOT+eo7LA7xEqf70fTgYyQu0xsBORurTTLu8UUNbQVKXZV9pf8x3cc6+ce4ugKZPybh6EiSM6sSHt8sBlwL//S82NLJCEEdVJumJx2h3X4f0HLilfFryrRP6u4Vls6FJBa9t3tZb1FpT0caOMEpfmlXKPAMkLNIkCiMZm3/sJrA1qY1wcAJCgweBO9JEGDMKAlfrze5LKP43hVpJvsJLzn/eS6/JHalwsHn5Zo4bed1obWMh45ARzuC8LHbmYJeTIFQMqk5HuOYbgwrdlfbcJ28sKndh5tQA29dE5V+Vvz34qH/dFwOTCxUi6xZQovT5WTV6kE65bw3E0zm3ncd/9+koA+ULJAVFgSqkSY1arRw1GKeksMLucJ77VcH86CQLqHBjZ HywfaFgi/c2SJeRoIrBg1jNje X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1948; 6:4ytaIp9jgVJyWkxYtFgEH2mLxWKZP/MYOYWF/vyFCNJubhcsh2FjMMK+y/9Sc12ej/L+422BeHE2ZhQJpQmH12q3H/nNAhuNuRHvkR1IOtqfBtgxIUeQL0leosvEdUB98WIqXlHqYE4nmFo31EVUzDRZlXohCfQz198OORgLEyDzmm8/yjl2LXynwzbLAp9U5mR0tfi/a5sG3dcxWuwLmXSHD8yiDTkCUeeLDGNuxdv8+a9ova2m22iQ6HDxBtSfzYOKCAFT2pFU0gBNe160m79s84f3rK6zZmsrOVtMtVlabVUNsdtCvym1Ry7Zf6+gpzURhA70/zfu+cJTrAi14g==; 5:kZw3KOz0Lp9Dl+KJSPOIm95UwNzEaOJmC5Vy9U1HnyXKbWPcCg5d1w7hjLRUOtlz+zIVjkNoeiRiZqEgta+c3VsuL/M343zBHsbJEOa5SvLGcz524BsEpV7a/QInw+7tc6kstvJi+pLqi5r1mRiwQQ==; 24:JpuPUdNFVePCJlGTkGiWUqWBjMjadky4/MGbQMf0pmfWnenI9W8AYzyIyb1qfuENBaGwzL4bTotrhDmxe3Bk+L/Yp65dVdQqjAG8jPYUFQw=; 7:pA2EnE5m3uqD961vzEApp2tyHy2arDdralXBmcOK/p/pvaVE0gFFxdJcY0K2KgYO3ARCo7UlduiHpGq+CuzaNWeWjO2E8JI7K3RNegRSZUo23++tHjbgQ2coOPV/Gp+l0gSKwpYdpzLFYLJEgqAsMu2V8xD+4YSmDT63W39/ykTSf2zBqww8Vza4fBAGd7s9zBaS4D1H8SUy7IWse/ny5Yrj0ia/ANYtihUwIOkoNcg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 22:05:48.1799 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1948 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 From: Joe Carnuccio Calling sp->free() ensures the context-correct free routine is called. Signed-off-by: Joe Carnuccio Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index b6b070db5891..5b033e265a3b 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -742,7 +742,7 @@ qla2x00_sp_compl(void *ptr, int res) if (!atomic_dec_and_test(&sp->ref_count)) return; - qla2x00_sp_free_dma(sp); + sp->free(sp); cmd->scsi_done(cmd); } @@ -814,7 +814,7 @@ qla2xxx_qpair_sp_compl(void *ptr, int res) if (!atomic_dec_and_test(&sp->ref_count)) return; - qla2xxx_qpair_sp_free_dma(sp); + sp->free(sp); cmd->scsi_done(cmd); } @@ -935,7 +935,7 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) return 0; qc24_host_busy_free_sp: - qla2x00_sp_free_dma(sp); + sp->free(sp); qc24_host_busy: return SCSI_MLQUEUE_HOST_BUSY; @@ -1024,7 +1024,7 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, return 0; qc24_host_busy_free_sp: - qla2xxx_qpair_sp_free_dma(sp); + sp->free(sp); qc24_host_busy: return SCSI_MLQUEUE_HOST_BUSY;