From patchwork Wed Jul 19 18:51:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9853005 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 93CE960392 for ; Wed, 19 Jul 2017 18:52:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DBCD1FFC9 for ; Wed, 19 Jul 2017 18:52:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6275B2621D; Wed, 19 Jul 2017 18:52:22 +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 8DF2720408 for ; Wed, 19 Jul 2017 18:52:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754989AbdGSSwV (ORCPT ); Wed, 19 Jul 2017 14:52:21 -0400 Received: from mail-sn1nam01on0069.outbound.protection.outlook.com ([104.47.32.69]:34724 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753813AbdGSSwP (ORCPT ); Wed, 19 Jul 2017 14:52:15 -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=eELQ0odkikErBuH3qx8F4AaoOnfvoHD4NFKhTnC7GKo=; b=BfVbJkjEnqqrc1bJU1eiNK6wOTcJtaZb4lhCQdsGTkdbWVkrVlN0MJXlBJiOvkl7zQ+zkJ+0Jp9aW9kns7c+kECeNjTDdmvYl8eAEoN36DAyyz3W1ER0CDmyYb6h0gsRXMwlKPTIiNQbXWIClif0NK9834ZpRt73cHpcCxlVAgE= Received: from SN1PR0701CA0028.namprd07.prod.outlook.com (10.162.96.38) by SN2PR07MB2512.namprd07.prod.outlook.com (10.167.14.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.13; Wed, 19 Jul 2017 18:52:14 +0000 Received: from BN1BFFO11FD022.protection.gbl (2a01:111:f400:7c10::1:123) by SN1PR0701CA0028.outlook.office365.com (2a01:111:e400:5173::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1282.10 via Frontend Transport; Wed, 19 Jul 2017 18:52:14 +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 BN1BFFO11FD022.mail.protection.outlook.com (10.58.144.85) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1240.9 via Frontend Transport; Wed, 19 Jul 2017 18:52:13 +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, 19 Jul 2017 11:51:56 -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 v6JIpqlw008603; Wed, 19 Jul 2017 11:51:52 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v6JIpqS0008602; Wed, 19 Jul 2017 11:51:52 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 1/7] qla2xxx: Cleanup NVMe code. Date: Wed, 19 Jul 2017 11:51:45 -0700 Message-ID: <20170719185151.8564-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170719185151.8564-1-himanshu.madhani@cavium.com> References: <20170719185151.8564-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)(39850400002)(39410400002)(39400400002)(39450400003)(39840400002)(2980300002)(428002)(189002)(199003)(9170700003)(101416001)(8936002)(50986999)(4326008)(356003)(305945005)(6666003)(47776003)(189998001)(38730400002)(2950100002)(76176999)(626005)(1076002)(54906002)(36756003)(72206003)(87636003)(2906002)(105586002)(106466001)(50226002)(478600001)(5660300001)(42186005)(50466002)(8676002)(33646002)(86362001)(5003940100001)(81166006)(80596001)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR07MB2512; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD022; 1:hjv4JWYTQ/C27CLEHijsxS2FYjegU6d2TFz/eGgpB3/7J8h3dzC9oJPMcBFcgXSSaNXXruarIvk2Atb1rJ9PasRy8NvQo88kc1Xku3njsAyNMOJh2Orvka3SBuW176+FZh7LIXauOaeQT2A3EoonCAlvVXqYvmDRGX/xjFZEJkN/16WBssOf0AehfHvbJsk2+HGB7XgQmCNFPqjPX5uA8IvUZPCg3R5+We2G9csfMsf3YG8QwSlYnvHWL9nKze3KLDXJ+OTTPI2hLBKgCzdvYANmEhkDH4IXxClTStOMSM28JPxvD8qDzqudDdzrJPGFYx8G9y0ysxvHcTdwVw5Rxu1q0dBdzo7EueanHz68sKcw4ONMyY505itm4oS+7KQWC0ZbvnJfISrT4+PvSt897LX9VMEz1MLTIYAUeBsMkGTtX6XYM7PRqFAPQKqxScToiUvK1L9DFfv3HZuP2whBGcm/l4hgBWWyb8QTzSiAymNkI2zMmo05j0B9HvlkmLpwDosuXNzIYzFWId/nFrk9q1OQSHYgVDHjoFmlzpeTrYhBD1pGN1bZtI71JuoCIRzqcLu6uGksT/pMJisEhIKon4v6rX/C+E8obIXETBRaQZl5sHxF62/ppuoSvuC1rouRkqvQHdBHAmqSxsgtr0XfGXqA4VrHRv27Vu55Tn6Ed99V2385tfAKMDu+qolA+xkSYhVdOszuwFzpZZtFXPoc99LlwzRWsLuPMdWu+4e4vjpN/3+r5tpkuOc4wlW/fzDq9C8/QJcagNFdSg3vw6YvMC5trgjmr2OQax4OHnO7Jg5O9PR1RDGNxJBBpS1muge3gDWZ3LMH48cAHYTk/YWClE3lyAgf5SFrmSetM809LI3n1qWXNbGx8CQcgxJhjWYl X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06ed8e33-5f35-4e60-9873-08d4ced74559 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN2PR07MB2512; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2512; 3:z7zxkFVmsiSgv2sJWkIfPSf7+mkMyTBYV29ufLqfASpKaaVscotKYxT1X5fnQcRdC/AonkYo08ERdheJ8fuV0+H/SQXC/+fC6vavpFqHbcuX9NQNWbSzklrKfNygSmeWYV6/hMcmEq/yHXV14+1FotkigRS7axwJ9rfmdcqksRcA/R5ZSA0hWz55zuuWuA/gYRe58AD10C9BLZu50OQPtRDoY63CuVEA5Mp3BxaBHvShOkjR8SytsxYaujIHo98SHpKjlVIZhXT8b8n2tasxTtFELyPPvY8apzwnpKG1Eej7uNERcdL46IU/H/ANB/L/Cpn4JvsulGRWIgDBW1wk/rFXId3L+7/wGCTWLn5jozcOdah5oI/rg29vDMSTYuYw+nrzfbtZp/aiCDdzAhqlKvz0yrRd61gGpHniSunfXNS0M6TIaD7NUiM7fon4Ipz4kDP/I41qG3LqlJQbZd169KrvzZwtJBqypDM0QXOhVWMaAEquGH4KT27Xm3Te7AkcGCONu4FHgCSeaz65Fc+nyEBklRk2XHE1C6NOcvi0FwvXb3nxBdtZO0B4SLlsvUoiPYSxu1syqZja8+Vv7/2WHoDjK1eEiE1TAz4weaXTrXBHGdnkt2q4C1z/3NVe10W4dAsxy+g3lV90vqTPrvdLXbGLdFaiEtxa+uG4hJUtAWHnISFj/HF32n6G9U329fxNu9CvWgotW1+th5IaTNWHYyC4CbuIZoaWQjuTfTE9DNnAYCnKa3R45sbhNZ7q5uA9xsEw2RvNu6sIiIV3tGGqZxGCP4OfBmTGakE6P5OowzI6IcrC8m5XsyrFBkl7BeqG8Ug5dtMPZno+CG1qYTp8PBWGd1+kFpNBlMsous29GuwqI1+pqKL+GY+UlMRKtZdenog/gVea4+2P79yucCUr9A== X-MS-TrafficTypeDiagnostic: SN2PR07MB2512: X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2512; 25:CWl4LqJGnI/kzpPLCiFr10kqRAsyGBbhvwNhS+oZUSJznBVbWSL+zU7vPmK/FmY3dUlS+1gZw7JPI/+phaq3x7Yc756k6eQmyFw/zcIYC6KSMGTYcpc6LEM2PyStTUaqd0iYwz34ciUbbw/Y7Z/owCiEnjlQC9sIrGov/SUhnFJ9xD2wVMR31pojPa/5/iXkpCrnR4ciW08o0iV8kpiZE9jCA43/D3TLXZF1X0WPlOY140v7CzY6pRIEjoeUylOR5haMLQpHDRtfirFtxdiSfBOua5BYZpBV00dW6/Bqyp2wKFIYd2t5hJYAM22FW2eq/bHCNSgfzNaGSAt92fUnlwAuEH2UzGKkpzdc82m1RQ0fT2ZtqX1Tn51Jsd38vdD7kVfiH8G4QApyIVPQS+2ZbnwGzDqxYi6GdNhcEEQf9IHy4X7sR8msEiSaq6s9VtxE9DS27YG9ONTMWB5sEwulZhSf6lNqvbk8gdmrFMFzhbj0DBt7+t8D2qSkOC5C1H7vYrYdCOcEZuq5XvGsNdMwdPLW+bNHTkJg3KpjzrUJDre8PhGnuZGfLk4tInGkZoC8jpCPwHQvGCWiOXeZqGW2d8zrdP8v/lY/5tsWhXpKQjm86aa46kwScOViLimpg/XFTUmUOnMaW7pZYQjZLoEyLkHi2LRyycMQfUkk2rlnxR9Rrk08AAhQ67lSLD9mdAUjhdAFeW/N8thW5Aej847FujS+wjY/tpekevg5YA86SLYtx2b8E3EcSe6Jmi+56dZFOM5jN8Jb5w7XNdbndEMUCdwh/Qn8shbmOIXAQL4RiyuRApr10QQ5OkQ7k3K+4kI+UnDtIXrxesQg0ZQTNtW0K91JCJrwaR6F9yUxqWevvJYwRfF7/1pC1NcyEg+HaBtcKcBoy+ILs8fGHt62oiHV+n099gVtilYQL4TJMv+PV q8= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2512; 31:tp1SCk67zBk63QPZ4odySTyPM5bi2CuHSJuoIYHEyZ2+1BW6jqlEq5CAXfp/kqcpcyEzle9u5/HBwja4YQAjBe7ozIRpy2y8/CQ24na6+I6GNRZBrNOM1HUBwGFQhg/557ir6fQy1MvAeSI4j4+SIeMERoSi+ufI+MbSBn+MHVwJ2LTICvOTewbGbJUFoCbi579og3tEnwmp+YCSD8cW9j+ZvOj3NAFj2zzmzBIGzPW0J5Pd6wDZZUzhkRU7MBXO3CFg/AucVqceQ4A8iXSxlF7qhEJUJwj2gjSVl5WjQouLw1h2N89hyydMjPA+fP7D2zmY3Tz0v0uU7yDK5a/23/qay8XUVRDo+0KMHNKBYTPBtfalW/wv8SMSgliuLOyWzNOo7DkUWa3EGT/IXubgUboOo0xUKAz70C0iSvihM33irCLnLskdYMwEZAVAZbtGm5He0kiKqZ+XhZV2914osJ3vgxuCOWhy1TCwthSiF3neDS+HvvRngrN1Bt/TOSp1E1ESnLzesRj3Xo3P5IiM8olFtwuuYEyRJA25Kg8ShDJxPv8xbafW1s27tOhqxUS1NoQzPLwxqh2FelZSZuq6+mEi++Jurk0ZnHx31uVADtDEqCAPJe0aCNXfw9yrwsn+fYm1WtnjZ4xrJQsjGhNgxVwO6zFgGfmjY4IUmZ8digFpn44W5FASNDJTVkg6tr0H X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2512; 20:Sf61Ng1e5Tod9fsoVwPDIE1EKVXs1HbHNx3rGDWZBhNRHR+Lak4ipqf/J2G0QUT10u7fF91korWhIwGgtep2JLD3MCUlm7KoulD/0sL1uUdxNEJsnOMnHLqhbuZLOGIggNpzDZhexk8ag9hHmCTj4zIMX5P7f4l3pZh0p0RUU66wf0WVN5KR0qai8FZuYmqTcnrkQhdO2M0ssxouabsBANmI2Oo2buGosIYLcBUXMyJzu9DBvU2bi5qv5Vf4kHI9IbiemqbFBFoiwDuLv2kgrT3C/oBRedSxUSLmvH6Szb+FKft7OpzcI0vtSRjxt8ycvIy2V5Doa5bWVPYH5EvulUpu+7yoJbtOV2ZDb4QbFxOLVxoPffPT5+ryyh6qSJumTFgO0lXr/3A9KFAKoXRiaCwzc0HQ2rwYvIxAXrPvKYltH/Ry1tvGhR94MGb038nw3a+cOJKvtLFXlImJp6t0Xtfg5iZXRQqHm49Br3G957Jpwrplo4niJ7D1a7qP0+AP 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)(13016025)(8121501046)(5005006)(13018025)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6041248)(20161123562025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN2PR07MB2512; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN2PR07MB2512; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR07MB2512; 4:JUvyTHkRdPoMIAEbRl9InslNthxY+3eBgFBrIWvl44?= =?us-ascii?Q?CmqF9HpdQeW6dS2ozbp9uiOh/YPOoX3do6azBwiYEF7dfki96/LJEwKJ5I3U?= =?us-ascii?Q?bfPbQFPhE+ImmY2tccSqOBeUShMpapAEcLdGVxmaPh55qx9NbMe6Q+LVZ3h+?= =?us-ascii?Q?PPXDOwlfn/gJD5rv82EXGguwNTMNDfxHw9NOQPUPAhMd7UOSFgTOcNuhWQJj?= =?us-ascii?Q?k6FvXN7pDscMZX+mhA7z8QiPNSbJ5lJk6AU/uAp/ML+vUpDnRyjbemmSaPAq?= =?us-ascii?Q?m5aUf4NAtw+UzaBDdSHqmiSNG7eKDC21LnhPDAdLwWnSbNsnxZmG/h+vMmAb?= =?us-ascii?Q?GYwIVS806Cwnpec77OUo53fQkEFigvt++Gztn1tmp2/wpG6TMQhBHvqks4It?= =?us-ascii?Q?S96fAnS7HWBGXeBT6yOQJS3WyKVfXvwtBNRVjVlO4vw7SYNG4nTj37PLfV1n?= =?us-ascii?Q?S4N02SzX4hXq3YN3nSaY1b/n+H/9b5xsZcBvZDKmvl3TWzazGd8LCcmuaBsb?= =?us-ascii?Q?GrGjubDrylnAhoanCS8T6Fv2xxaeE6GNeC07IEyHeYOhg/PWwpThoPe6N225?= =?us-ascii?Q?710D2g3tqoBPdDr1Uek+Qd3IL5kqr2ZA4oCs5PJzalpIlLwUGxFLRBFvnUrG?= =?us-ascii?Q?6C7CHbRjinMk6VCl5wlRsypAeyEKmbsyENJ9l1zwGZY+sgz+AmFxwI3Ztazt?= =?us-ascii?Q?kwUjQjuA4NFHXOEFiaax9Wup/kZ/Ps1dukvdkzUyPETg5HhkDI3n7mhOyWsu?= =?us-ascii?Q?+fD+/Tp5DcY1aUUSyz5ourWgoKCAKwag8RpGGcYQxK06sRaDdA/+VhxHomGi?= =?us-ascii?Q?4V8fRRy/9DtpsKj6rJtmh0nL+eNRTii9/5o2PPeKJD+o93/VJ5PpPVbkoyJO?= =?us-ascii?Q?oVzndYya57Gttz5NRYTIn0TMbn1Hm5Q+HI6jYnjNMtAj18jDH50/fHcsfK8P?= =?us-ascii?Q?S9ZQt9DiAT2aQOpzMrduy5ioLmFOA6g+6pi4X96vihhBPwmezRYRzBjBk3Zg?= =?us-ascii?Q?4Hgda1AABPcesLlZe6NDSnutNXBLzDlWlciw88ngXZZRIz0U6DoSLMKhaDcq?= =?us-ascii?Q?73hPBUStGHPTUsOjmPWf56JNTNkegjmLkge2T7rPJg0lrotOkiYEWjiqQ7Wn?= =?us-ascii?Q?5DuiDA4QA1rQzprqYOOTZgjp7n55AewjqNg+WAiij0NSC8ZEnSdgOqN7AtuM?= =?us-ascii?Q?Yp0E7oG0b1CFM=3D?= X-Forefront-PRVS: 0373D94D15 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR07MB2512; 23:Tnygu8g/WakCxo4YuSfaRn9ZVOlwMxoDGdZCltQAk?= =?us-ascii?Q?SHFSN+4NbS+rCESOZDoQUBuegbiHL19V9xr5JQu528dWytjqlbM+WL+RS3Un?= =?us-ascii?Q?3+eCZhzWoypXwYM86BHyLEk7O7CWm82t4PdEz2DGR1x3B4QgC03oiY5SxCYj?= =?us-ascii?Q?wD4k5zXOuZZ6yew05Chf4kyZ6FbyX9FbyECjE2j5lWctVzgAv+nxDy94zTYO?= =?us-ascii?Q?hkK7BtXMbiPQC0PctjnRbwt+eirHbdFADtZeNNEdfOgL2uhZxfXZpbnfMxOn?= =?us-ascii?Q?ybRRC5YxPK6yRRmUQVc2GxpFxA04hUbuDDLnhSJodw1oplqM4N7ULIWD6uGg?= =?us-ascii?Q?rpoXKtD4QZvZBNtQoaL5H1iE24fe3+I9jNtVJHIt9gAi3WNY2BWecIsTFT6Y?= =?us-ascii?Q?10E2+F7YOU9ByavtGieKCTlvEojP+6DoXloI3a/sNCXP3MyFfPkRrUtDQp9x?= =?us-ascii?Q?+gV2r4fMNRJSsMWtOry0mgNJD3g+HNQiLXCLyA2UyLN7ATYhL8LlKH3bF8jX?= =?us-ascii?Q?6DvFyEMEHieJW4kIXu8bcyIHLRyFZq7onAHvLgfim9B9kWwRnjmp/I6SOcmW?= =?us-ascii?Q?N1ckUW+yqo0LCF9mgzMZvZiXBghQegzEh/WuFgHz7oZkoMsWdcXdzY0+0PDe?= =?us-ascii?Q?kLyJDF0WX5O6WoM/3JTRlalK1LakqL1unV0mx7Z/TsZ2P8bJ5c+wbDsjKZQQ?= =?us-ascii?Q?2vHHciatGOs/uMESQx/3SAru8OJIvgTAsTRFJ5aW5C8X4dwnUEjW8CmGL2kv?= =?us-ascii?Q?XTs9Iy+lImKE3Z8IvcjlOxM3Rl0ytJYy67IuijDsOiSKOdHHo5TqwWRHh2ib?= =?us-ascii?Q?AGayZCfU24sXfBarVnJad3kfRDz+CG3w6d5aoXmjlWj1/FBPxTtkc7li/g2+?= =?us-ascii?Q?7ImxjuJAnlEYvRZYziksqUnZVyQCGCfG2cMb5km+2NWcox7NgRDrR01LbBmU?= =?us-ascii?Q?2+sMbgRH2s0/WXNgLVY4EIZenQ4tFJdbKcz2EDg47VorANmKo/LzkGMANnKb?= =?us-ascii?Q?qkqAiYQ6A93ID4llL5Lj5e6wvAtXGKhYICbK8r2Ls1JU2WCErl2rNOzqk9Uc?= =?us-ascii?Q?81GQ9czYXIJ0/VUc6b988a/OYDssAQNHrfXY2e7AHPgdepnMQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR07MB2512; 6:9J5kYXW7rhB06bH3FuK75MbLM7OKcRI4a5w5wF8s0H?= =?us-ascii?Q?gNd0LlyIIRzEQNkQOIyp1eYShVjbDo6lylz1EwP6vfVl9kAbdQB5TQyX7d7a?= =?us-ascii?Q?n22iImPUR/xRl+PT1VvoMbU7qq7NTZVWSPSqhE5oGi2jPeEUUgFQHaHIas0k?= =?us-ascii?Q?IRo1MxL+ctTiBNU6p1u6+t1pKd0NDm2b6DQ85PMKFNnZ1EECatxSwDgjhMsZ?= =?us-ascii?Q?ACn0AbUz3lc5TOOlPi/APS+9LPF2R9cFfHhmXTj8dUIkc5SW3fPzaIiZAz+s?= =?us-ascii?Q?gRl37iyO5wZ1UoQKX+ZLSbYszW4DffzVuxOJ1AQZ3LuHPhM/PP0110CqwPZ5?= =?us-ascii?Q?sxWWo5+8mYGER+zu2LIsKlDbijuRBvm9T7ZFeq4Gh7/zlENpd/It2eBc/ksr?= =?us-ascii?Q?kouVPksEcCuPYvI+jyPJ1mxvPtXA7PB9OE6MS3e/oC0bSJNj2NDiIykOrQLR?= =?us-ascii?Q?kFcEMcmRaOgAHvc1qoA+cDEO167LL2q9FvPgmwDasCxyBdz0mmiDnALUowqs?= =?us-ascii?Q?SgyPe0Vpwtz//CvvGVhYJ60vuUTrxyUaRamhzxPIUogRePn8vo/Chwss1Tuz?= =?us-ascii?Q?exYPrHmnPqoxN+PoQJgOKoQSdVKb7XSUpCWE3VO/GN0vbFGnI6B4VomVFwvi?= =?us-ascii?Q?KYDTU9Y1ukrMSAYOLp83Xi6EOzWyDhzEVCM2RkdkrzPgwmNx/3TJqBLSWC1i?= =?us-ascii?Q?MCcPmTxFRwBwSKaDswzXkbJqQ+d/YllG/thDIH0VgaD5FjfrvvZ+cSNbMfwy?= =?us-ascii?Q?X3zDt+MjRtO/lo7VA2UgrWqttw6+MbQiPRiU3H4VxqQRaGQBTsASBI3ulXBc?= =?us-ascii?Q?sHe1nFarBG2489pySAWmugQqisc0hsjARSfPRwJji8lGtVVp8wkBk/1NGPhc?= =?us-ascii?Q?V0Qp4t2jgyMQd0ANrkRlGf1IrUv1R494WKXCQifuEeFafkec7WolPG/Rzoc6?= =?us-ascii?Q?I2GrlJpLoXMCd06p2VpN6UvMNhMiYSwUwXw+QxCuT+dC9qEkbllV+SkySokk?= =?us-ascii?Q?k=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2512; 5:1nFS/hIR/TGwf4zVZyGMi1naPF8zkFk70PIwTY/f04zT48joJkhvPUm2TPRzwr/ojDHnvHU1ZfAfDnvWbsVP8SVp2QiUr8w5KKoGlXwpvg91uhlp1ovqm4oeNQIh7YtDfHNwjrZIySemMF+nWNX+68nVyLMVUGwcvlfICgdQAOieu+dYecNsA0wjQCEFtnLpGH+DjV2ASTcehJfczwXb2MD1JTDwPx+1g7nMy4dvGBKqJIafOtS7vCglzVer1/TEFPzyueB3H5/ZwNzMemrOP4gkeiNgxmVpgVkJywQ5tfTIVfTj0lC8b7x/d6Phv4TdQ8x03r0SB4SA9kqs5Mm03lbwQach0mX65lWCCRWa+lBrtSAuFqqZphW3rY1XyIzzPA0aBwlE/bRVtuwnpHQtsA3O9azF3kesxUKtYe4WrGv4mBfXuYYxLaJE0d62n+fOnjDNZ7aaAQc644JCpNfybVfM+0MRnHlGJqHbNJ19RPJVa2Fo0/UeTAUDgHvwSfXV; 24:FENBkhl80LXqz7GUTP31kxZVQ6EHJNn7uuzSCvfRA9yvzeonTS8k3jVNrhuvUDcd1rOt1aqV9K5G/HSV/+DOVjl0WqWwftvRdNnNJZMFehU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2512; 7:3jETv9Taj+G9K2XoxZjra8Ixp0XKovaSnXCEqlhCAFNS+UbLFwA71V7l/UXz/xhH5v8krC6r5Ddmspo22k2RH/kVErTj9DdOxHVcqOS5zO0hHUbU6L9vbRl+oXVpi4dd9rcfm7yXfZkezKiVdzp1OhjgNJOm1v1e0ODM00M+14O01dhp9YLODQMhzECCrHL2wAb+d2QnooARDoawPX9bk8hItiIsWBYu+CQVH/XITEWlonRwtyRyGH00kzJ+ueRulxVZ9VACXPwPKbUZfejQhQ6Id8YsNW2ua20dWMB9qOzKbawQxBTkzSmiJxAG39rtgpgJg6BuSbqNeAc4rS5L+wmwp02spph+jyttwQ+NhZSU6DD+5tTM9k+KbLmhF0R4ZgGgLQzI4Jo48+odpzc1w+Z35iUDP05hf40nFaEbLk/uraF/linprAaXItXjVnZqEWfTUfgrcB7pK8eya0Fg1t6qRmilBOn2ySGfuphiazavObZLd1Pqkt2w2nKHLDBis2TDDTqGQ9fTC9tpcOSr4Sq6Cy+kvZDrn86/PZT9NU+1eDnYpyLv9/k+qjeOzXIq0vKn4gWpxum5IYsQirm6zkvS8yOEgNSbh9eKDpC0omLIqxDqb7Pu4tO9unKeCkeylf0MeEvdbl+U+OW5PnkU64Spr4Ky06So94SWHYOHfRL5QkuZVVHo/4Yjg57Nh/cIwDZ0miOqaghRMHkqG43nIaIaSTkaglWQXAULx01XoCNWZtn40xkxzADpN/GDZbfpln8zDoVhhpAcKRKIw1zuWc01rs6LTKH9bvbVF3bnhgU= X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2017 18:52:13.9440 (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: SN2PR07MB2512 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 This patch cleaned up code to make it more readable Cc: Johannes Thumshirn Signed-off-by: Himanshu Madhani Reviewed-by: Johannes Thumshirn --- drivers/scsi/qla2xxx/qla_def.h | 6 ++-- drivers/scsi/qla2xxx/qla_nvme.c | 61 ++++++++++++++++++----------------------- drivers/scsi/qla2xxx/qla_os.c | 6 ++-- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 0730b10b4280..1635e98867aa 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -470,7 +470,7 @@ typedef struct srb { uint8_t cmd_type; uint8_t pad[3]; atomic_t ref_count; - wait_queue_head_t nvme_ls_waitQ; + wait_queue_head_t nvme_ls_waitq; struct fc_port *fcport; struct scsi_qla_host *vha; uint32_t handle; @@ -2302,7 +2302,7 @@ typedef struct fc_port { struct work_struct nvme_del_work; atomic_t nvme_ref_count; - wait_queue_head_t nvme_waitQ; + wait_queue_head_t nvme_waitq; uint32_t nvme_prli_service_param; #define NVME_PRLI_SP_CONF BIT_7 #define NVME_PRLI_SP_INITIATOR BIT_5 @@ -4130,7 +4130,7 @@ typedef struct scsi_qla_host { struct nvme_fc_local_port *nvme_local_port; atomic_t nvme_ref_count; - wait_queue_head_t nvme_waitQ; + wait_queue_head_t nvme_waitq; struct list_head nvme_rport_list; atomic_t nvme_active_aen_cnt; uint16_t nvme_last_rptd_aen; diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c index f3710a75fe1f..3c58d1b71e6e 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.c +++ b/drivers/scsi/qla2xxx/qla_nvme.c @@ -77,15 +77,15 @@ int qla_nvme_register_remote(scsi_qla_host_t *vha, fc_port_t *fcport) fcport->nvme_remote_port->private = fcport; fcport->nvme_flag |= NVME_FLAG_REGISTERED; atomic_set(&fcport->nvme_ref_count, 1); - init_waitqueue_head(&fcport->nvme_waitQ); + init_waitqueue_head(&fcport->nvme_waitq); rport->fcport = fcport; list_add_tail(&rport->list, &vha->nvme_rport_list); return 0; } /* Allocate a queue for NVMe traffic */ -static int qla_nvme_alloc_queue(struct nvme_fc_local_port *lport, unsigned int qidx, - u16 qsize, void **handle) +static int qla_nvme_alloc_queue(struct nvme_fc_local_port *lport, + unsigned int qidx, u16 qsize, void **handle) { struct scsi_qla_host *vha; struct qla_hw_data *ha; @@ -193,13 +193,11 @@ static void qla_nvme_ls_abort(struct nvme_fc_local_port *lport, struct qla_hw_data *ha = fcport->vha->hw; rval = ha->isp_ops->abort_command(sp); - if (rval != QLA_SUCCESS) - ql_log(ql_log_warn, fcport->vha, 0x2125, - "%s: failed to abort LS command for SP:%p rval=%x\n", - __func__, sp, rval); ql_dbg(ql_dbg_io, fcport->vha, 0x212b, - "%s: aborted sp:%p on fcport:%p\n", __func__, sp, fcport); + "%s: %s LS command for sp=%p on fcport=%p rval=%x\n", __func__, + (rval != QLA_SUCCESS) ? "Failed to abort" : "Aborted", + sp, fcport, rval); } static void qla_nvme_ls_complete(struct work_struct *work) @@ -214,7 +212,7 @@ static void qla_nvme_ls_complete(struct work_struct *work) static int qla_nvme_ls_req(struct nvme_fc_local_port *lport, struct nvme_fc_remote_port *rport, struct nvmefc_ls_req *fd) { - fc_port_t *fcport = (fc_port_t *)rport->private; + fc_port_t *fcport = rport->private; struct srb_iocb *nvme; struct nvme_private *priv = fd->private; struct scsi_qla_host *vha; @@ -236,7 +234,7 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport, sp->name = "nvme_ls"; sp->done = qla_nvme_sp_ls_done; atomic_set(&sp->ref_count, 1); - init_waitqueue_head(&sp->nvme_ls_waitQ); + init_waitqueue_head(&sp->nvme_ls_waitq); nvme = &sp->u.iocb_cmd; priv->sp = sp; priv->fd = fd; @@ -258,7 +256,7 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport, ql_log(ql_log_warn, vha, 0x700e, "qla2x00_start_sp failed = %d\n", rval); atomic_dec(&sp->ref_count); - wake_up(&sp->nvme_ls_waitQ); + wake_up(&sp->nvme_ls_waitq); return rval; } @@ -276,20 +274,18 @@ static void qla_nvme_fcp_abort(struct nvme_fc_local_port *lport, struct qla_hw_data *ha = fcport->vha->hw; rval = ha->isp_ops->abort_command(sp); - if (!rval) - ql_log(ql_log_warn, fcport->vha, 0x2127, - "%s: failed to abort command for SP:%p rval=%x\n", - __func__, sp, rval); - ql_dbg(ql_dbg_io, fcport->vha, 0x2126, - "%s: aborted sp:%p on fcport:%p\n", __func__, sp, fcport); + ql_dbg(ql_dbg_io, fcport->vha, 0x2127, + "%s: %s command for sp=%p on fcport=%p rval=%x\n", __func__, + (rval != QLA_SUCCESS) ? "Failed to abort" : "Aborted", + sp, fcport, rval); } static void qla_nvme_poll(struct nvme_fc_local_port *lport, void *hw_queue_handle) { struct scsi_qla_host *vha = lport->private; unsigned long flags; - struct qla_qpair *qpair = (struct qla_qpair *)hw_queue_handle; + struct qla_qpair *qpair = hw_queue_handle; /* Acquire ring specific lock */ spin_lock_irqsave(&qpair->qp_lock, flags); @@ -487,7 +483,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, struct scsi_qla_host *vha; int rval = QLA_FUNCTION_FAILED; srb_t *sp; - struct qla_qpair *qpair = (struct qla_qpair *)hw_queue_handle; + struct qla_qpair *qpair = hw_queue_handle; struct nvme_private *priv; if (!fd) { @@ -496,7 +492,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, } priv = fd->private; - fcport = (fc_port_t *)rport->private; + fcport = rport->private; if (!fcport) { ql_log(ql_log_warn, NULL, 0x210e, "No fcport ptr\n"); return rval; @@ -512,7 +508,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, return -EIO; atomic_set(&sp->ref_count, 1); - init_waitqueue_head(&sp->nvme_ls_waitQ); + init_waitqueue_head(&sp->nvme_ls_waitq); priv->sp = sp; sp->type = SRB_NVME_CMD; sp->name = "nvme_cmd"; @@ -526,7 +522,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, ql_log(ql_log_warn, vha, 0x212d, "qla2x00_start_nvme_mq failed = %d\n", rval); atomic_dec(&sp->ref_count); - wake_up(&sp->nvme_ls_waitQ); + wake_up(&sp->nvme_ls_waitq); return -EIO; } @@ -538,7 +534,7 @@ static void qla_nvme_localport_delete(struct nvme_fc_local_port *lport) struct scsi_qla_host *vha = lport->private; atomic_dec(&vha->nvme_ref_count); - wake_up_all(&vha->nvme_waitQ); + wake_up_all(&vha->nvme_waitq); ql_log(ql_log_info, vha, 0x210f, "localport delete of %p completed.\n", vha->nvme_local_port); @@ -550,11 +546,11 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport) fc_port_t *fcport; struct nvme_rport *r_port, *trport; - fcport = (fc_port_t *)rport->private; + fcport = rport->private; fcport->nvme_remote_port = NULL; fcport->nvme_flag &= ~NVME_FLAG_REGISTERED; atomic_dec(&fcport->nvme_ref_count); - wake_up_all(&fcport->nvme_waitQ); + wake_up_all(&fcport->nvme_waitq); list_for_each_entry_safe(r_port, trport, &fcport->vha->nvme_rport_list, list) { @@ -594,7 +590,7 @@ static int qla_nvme_wait_on_command(srb_t *sp) { int ret = QLA_SUCCESS; - wait_event_timeout(sp->nvme_ls_waitQ, (atomic_read(&sp->ref_count) > 1), + wait_event_timeout(sp->nvme_ls_waitq, (atomic_read(&sp->ref_count) > 1), NVME_ABORT_POLLING_PERIOD*HZ); if (atomic_read(&sp->ref_count) > 1) @@ -607,7 +603,7 @@ static int qla_nvme_wait_on_rport_del(fc_port_t *fcport) { int ret = QLA_SUCCESS; - wait_event_timeout(fcport->nvme_waitQ, + wait_event_timeout(fcport->nvme_waitq, atomic_read(&fcport->nvme_ref_count), NVME_ABORT_POLLING_PERIOD*HZ); @@ -625,12 +621,9 @@ void qla_nvme_abort(struct qla_hw_data *ha, srb_t *sp) int rval; rval = ha->isp_ops->abort_command(sp); - if (!rval) { - if (!qla_nvme_wait_on_command(sp)) - ql_log(ql_log_warn, NULL, 0x2112, - "nvme_wait_on_command timed out waiting on sp=%p\n", - sp); - } + if (!rval && !qla_nvme_wait_on_command(sp)) + ql_log(ql_log_warn, NULL, 0x2112, + "nvme_wait_on_comand timed out waiting on sp=%p\n", sp); } static void qla_nvme_abort_all(fc_port_t *fcport) @@ -757,5 +750,5 @@ void qla_nvme_register_hba(scsi_qla_host_t *vha) } atomic_set(&vha->nvme_ref_count, 1); vha->nvme_local_port->private = vha; - init_waitqueue_head(&vha->nvme_waitQ); + init_waitqueue_head(&vha->nvme_waitq); } diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index df57655779ed..635ce75c630b 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -710,7 +710,7 @@ qla2x00_sp_free_dma(void *ptr) } end: - if ((sp->type != SRB_NVME_CMD) && (sp->type != SRB_NVME_LS)) { + if (sp->type != SRB_NVME_CMD && sp->type != SRB_NVME_LS) { CMD_SP(cmd) = NULL; qla2x00_rel_sp(sp); } @@ -1715,8 +1715,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res) if (sp) { req->outstanding_cmds[cnt] = NULL; if (sp->cmd_type == TYPE_SRB) { - if ((sp->type == SRB_NVME_CMD) || - (sp->type == SRB_NVME_LS)) { + if (sp->type == SRB_NVME_CMD || + sp->type == SRB_NVME_LS) { sp_get(sp); spin_unlock_irqrestore( &ha->hardware_lock, flags);