From patchwork Fri Jul 21 16:32:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9857283 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 998D360385 for ; Fri, 21 Jul 2017 16:32:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84DC32872B for ; Fri, 21 Jul 2017 16:32:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7942828767; Fri, 21 Jul 2017 16:32: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 539822872B for ; Fri, 21 Jul 2017 16:32:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754504AbdGUQcj (ORCPT ); Fri, 21 Jul 2017 12:32:39 -0400 Received: from mail-dm3nam03on0076.outbound.protection.outlook.com ([104.47.41.76]:53206 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754487AbdGUQcg (ORCPT ); Fri, 21 Jul 2017 12:32:36 -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=FSZeGLwk+1w6OhNs0gwuh97J/FOgcJbCXXvw5hLVpuo=; b=dKG0IWqSaiDkU5I0+j1yjzTLZeLUre1GYiJOrGAnU8sjsmdExZxwaNh8htEB2gHM5XolgS5kG6COcLBbwAsR8m0UBQ/b04u8DrS96u8p06ii6DgTPkCupa+UbMTCIOJv3jnTWN23VtErB0aKQlLyT61mXGMaMDJzIuj3dJUTsao= Received: from DM5PR07CA0044.namprd07.prod.outlook.com (10.168.109.30) by BY2PR07MB2439.namprd07.prod.outlook.com (10.166.115.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1282.10; Fri, 21 Jul 2017 16:32:33 +0000 Received: from BY2FFO11OLC016.protection.gbl (2a01:111:f400:7c0c::194) by DM5PR07CA0044.outlook.office365.com (2603:10b6:3:16::30) 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; Fri, 21 Jul 2017 16:32:33 +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 BY2FFO11OLC016.mail.protection.outlook.com (10.1.15.61) 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; Fri, 21 Jul 2017 16:32:33 +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; Fri, 21 Jul 2017 09:32:29 -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 v6LGWSbZ032378; Fri, 21 Jul 2017 09:32:28 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v6LGWSWk032377; Fri, 21 Jul 2017 09:32:28 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 1/6] qla2xxx: Cleanup FC-NVMe code Date: Fri, 21 Jul 2017 09:32:23 -0700 Message-ID: <20170721163228.32339-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170721163228.32339-1-himanshu.madhani@cavium.com> References: <20170721163228.32339-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)(39410400002)(39840400002)(39850400002)(39400400002)(39450400003)(39860400002)(2980300002)(428002)(199003)(189002)(72206003)(305945005)(87636003)(50466002)(356003)(54906002)(5003940100001)(1076002)(101416001)(76176999)(2906002)(86362001)(189998001)(33646002)(80596001)(5660300001)(478600001)(69596002)(50986999)(8676002)(4326008)(36756003)(8936002)(47776003)(106466001)(48376002)(6666003)(105586002)(50226002)(81156014)(2950100002)(38730400002)(42186005)(626005)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB2439; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC016; 1:Iuu2y06jJMlTqCqJwns+0hpXnOse6EYYgIK0jy7g3v/vRlBTgPcHVTaRY1914BOM9T0QpI7waNuyFskinre+Qr77mmj4nAFIkzVoi3BVohaFYJwaQwZsFnZx4AmL0J+peJdzva4F8PZD7+ua+gA8rmWo8gpQtqnRJ70cy+MJ8VDXSrCrNNZwMQK721kU/Do0iTN5cOMuVKQzkV7XX2lBMxrjmhpgg1wUri7HNwcRdRIgf5KjxJIriTitjvGx7ErgTSxF07032+1daEPMMSNDKPbuJ84A06iGjj2GItnPi6tdD8NCj9fjfbwKivKp/mMD33skaOMNCineDcMX83WBeHZ2J8rrKimdOx24hkcElLE5+UtrND2WIYkHzcj//6b3AGX6NRe4kvsJLaNCCwtqM3mQlILwryx2g+jS/kpe1dCKE7esl6RldLZgQKBEBKFhg1MPSopTYU+82O7k+PUfOY+feMp18fObCYKBvxFvhnFNJ3m+cKZhbrtacaPjP1f8jlbtHOF8Zc55laDoCJUnLXoOU800LR5TjArzosYijY4JI5F/Xij+FgVn5cIiSxuYwWYv0xXbyWeaJQlmYnYb51I9Tun9zIgnVnkMY5qgY5cgSIq6LxHYQsZQmJ+e0v1/eoRxVbmUGvx99j3GSEhng6zz3fbmbePN4U4Wz1HalvEbk9xvlxo8wHWZ7S1XVkSvYCBZGxnJ3JSp0HmOCn7w6iBLQo6Y9LL4U8Lbd/WIP+cfZgSlKMwySevh1Sbyh7geDjE3TJAu8s4r43aicrJCmFTqMsm9gaRk7cgWx/p+EqeSnqbo7/FAoWl27ujLhVPZxLCLBInmLLbr1KKr2fRWOA== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1e2b0b3-7ce4-4523-59af-08d4d05616cd 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:BY2PR07MB2439; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2439; 3:Y8gRDxPRykcCcQlgOsyOualtsnNvIEpzVwbyQM4zsgka8gQjj/Nx5a8+x3yxeuNN0BnMgsO3NYo7GE+pVPgFNRdyamRDbQC2Oz5wZ9MpIjAymNrUk8QrF0xLXOGDl7wS2nEhmhyuoo3+3k09Q1Vvo2hedujMM/DcG8kry5TJzCjO9fjeKGWvad5/l9RfDYHh7PPJzspJjIqFajzVWk+uaO24zKn2Qa1omh52+Dgo0Okoi0b/5egrhi7aaTW19ey/dqq0rdvU8NLosUHtfAlezUPH1swkCf5tabnfrwS0AgshYgIYDSkNzrR/udz7gYg1xKrlRyTTq9we4AgI+mCWkGvgBUuP5zUac9/C4h0PbzQYev9B9EwRvh7lAn2gNeD+XRGvP69o/TNKHYF1aYP0HWTw5ELLA9uCA1Jew6OC4D6BxZwa3NkKnbI1w6r6PFmssHHpdFLkZOdsxSuNU7aWPBXdYuhrOgqHScquqfm4gFhG+zjPmaNKOUU+9YfWL3J1Zfk8VSVYdVCFp8DdhxmvW+cX4rMLiP5DhgS0To0nogUSeNbZU0S1eDRbTC1klrPjtYs356iLbuS73zSEH+WIEF1IPE8mcYt/r7EoSMVQF4B+BzZLtYGNj/rWNLEPVlC4hgnQbNnbrZFSXvFONGGDWtQ5+PCcbPkGiSYC4RP6TSf66shfkYI9s/LWs6JrzUS3mdWCq8bgmetLYKNhx8vkMF3I+IAbWwrHC7uM59Aj7n4GsE8I9lbUD6/MVUbnryJHfTgoozFqo7mCoLKkF99nrbuzfBAkfPJiJNCKmlbUE2DxhZIk9tnD9uY3IGFW5tJoIGZyiUCfZ8KpBaFgJm0JI4fVOcyfBLWBKIGYYe/HhAuvXL7vuoouZTuRNafusTdvVWboPBWFqarJp2gTTeRKuQ== X-MS-TrafficTypeDiagnostic: BY2PR07MB2439: X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2439; 25:cjch1Gqn8A5HfwAHiMWOLABAV0wyO94kK4KuaOvK5Ci/bfa1/lWlPRxyCX9ra0Yc64nyzYqcbXi0xD5sqU6mPa9aatoTcmMPpA1eXp7Fq8muoZqJ71c7BskIyIsOWSkM21Notf9GvguY+FiyUEoUF++Q2SqZaHT0h8p/S0URxOluxoSdWSlhN4dM01/MesEQo1Lax6t0gdzdACocgpyWVNj2nTLcnEDlsh8NdjIyx9yUNz/VWCkCppmJ3QWsCfT+yYCTPqyguFbKWDlnCzODSzXtPB3QXfiLPRBeAT6TvfY64c+v+n5zQk4NpazfgYMCBrMwuwpxW0gTfiRrF8yDpukcH/KvKvgQF1Ae9VAPFiQN8Lr9ZIQuXCEWQrzuOra/yl7uFX6HqeBsO0/uwLjR5CF+uo/Eyx832RHe7lRNUWGZVJgmHfnclKf0MMEKSR7AywGL7p+eO0K+vOzyhMoWpHqZTyX4M9IUXMJ8LrI8dsthS/Ue2UaDiAMxJ1os6vumU3kOqltU7ZiR3uEjyVZZXM0htJ/F7QwMiiseCnvrRgS54f1WZF2ZMSI+a7AQGsnlDfjtk82CRJ87vVdDKLpKID4r3Sy7f+NBvcMMfmCiU5cp3th1ks5uQdTvVPgXT/gDA/rstsRCqVJ3dWRDlAos5jC5Xd/Wd9IxOginC0MQ1brCSfVLcuXLGz/ULcHa0oteB+l6xDJCXi9C/itPQJMSiW5GaQD3TRMcwTk/ddxBd8I0fVaTZZlOL+07hckCv9wqqM7Z4OOjmdK9mfE4wI8Az7p6dkvf8Nb9fIi3NArqrbxY/jFFWJEN/SIKyKFtsFBenbWFo993OzK+StYvUlOtrpCiti9CFDOVAh/K7Fv4mBNQvrWpwq8Mp7RLiPjjNlsqi6NigMkEJe06r7QwoC0T69YN42QFdGl0EdW51Lf1X 4E= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2439; 31:Ds1yAXyt/BKXh/aAydHfqP52v90NbG2I3WyTEKSkO5LSf+eA7Rko4Wn5EtkTRfK4GO9Cvheu1thpV8Wxvbu6lr+YiiSSpfDGjARn7jnV7emFI2aJDz1LQXQPkq/6uRmtvEh2ELVpgLkImtIZB1MDQMgbxTN60eKCec2WkXaxS34ZD5KrDemU6ptqvstuSjwM0yJSCKdK3DJZZ9atVVLiUR2pu5Id/z4ohTso73vcfraX/dztTYD2bllMSBYnSmN2hG92bq5AVqQXbA6D7nhV/JFZmKCVeZnyV3ngr7L8iFukkKk5JnMwK4H9Nl7PGhHxgI7H5EGFcfGhyPZ/Zp+QpXssKfOR28pYl7v9Ix4fB1oyQ3OlmS4r2Qe4PQE6P5PNZLTQ7MMlMLPufnKvBB4p8uQ8Y5ZCyooEzKmksjZJkX2IMH+qhB9DNJkhB3CEIkZSxgcCLDlTVoK11nFq8r9u9ZEDOOAiouckPufm6oI9+kA13p8o5qVhUNKsWiPtTiucnFzY6ar/cFgAS8tgnUf176KzIfd6TSJ0yhv38gG8Y0qLDP/QhUdmDshTJ/POqYch7jMVV5uUIqbIoD16DcCbBZq98m5rKmTKLod9JcW0jbYJyfEIHdJl5eYAD7qkS04LXirQJqDyR6OihOClreRVkrUQXvaaawP2VD4thYncy7Hy+2q5PHUvTAAw3DNvpG1x X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2439; 20:MRfzZOgEFMVgpqEmCVNWf8160cCUnhsPJlCHTf4q6sjDbSM0YbZUtYxOgr8vdgRVemuxSJq0xgIdsnSxVkFpVspNZ1Dq1wwZkVChzGEoQJ905bPhp1on2U14krU79pKGE2arMhF/eSk8fYsvsbiTXl5cC41SwYG6alwnXnJWbN6h7oOzFA85IiGVi7bBvVauoEiUFCYH/1LZhsBFH3b/GquGLS7boTzcccd+JCpzw1Yy9G0i9geLxcgksBKHNydIMmQjvY4B5MtqLMWQ53vBp6nmcbZaryyUjyVQKsQUj1OwKrRR5KqdqmQA55KUQFyiVfkghjdFPPKdzDlMGRl++z5m94Pa93C+rKy9XDpdspwKkL9FDNy5oZYClu9Avz4M7IbZseDEFKbUX+A+CVFd4rvGLS9WWtZyzO7NlPN8icAmuvFutRkQUEoaZWSqt3XEUb08uBviYl/zySSoA78sELXMdBCbMvysQgX3vQe3GfyG9Vjh1wHcRgl+GyntW+kL 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)(13016025)(5005006)(13018025)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(20161123558100)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR07MB2439; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR07MB2439; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB2439; 4:uy6Ka8sKGY7SvFUoA1ChzPodvpzwvmeDFJSxIkVtLV?= =?us-ascii?Q?AJvUQBaNvUTP011+Fw66yqMnI7hp65gW/mcYUHqBC7RTYn+HTkULmNDVygg8?= =?us-ascii?Q?6sBhulvNo0Cng2yj9aCQS76BbjPEQGlA+GsLNkpkRJ61g8ZFGaLblAheTv7i?= =?us-ascii?Q?w1RBjb5uIuEEcc4bdV5Lk19Ff5Fi+SLeLKzGhODOreT28KnzRa25pTmlDqZS?= =?us-ascii?Q?5nP5OFCnGVOfeHUsCxRMehngcPqVB4HDhBZDDUTB8+TohCBAd3M57zj/u1oc?= =?us-ascii?Q?Rz5YAoWoAh/sE9oh+LScr0pjwHSdy4mtskWFayg0mudCy/wg/jHUb0VI1w+b?= =?us-ascii?Q?2J95NrURRTNwota/Byycs5nMl53bXYHgusMcezZ8/Ajaqnr3lUe9PsuPrbLB?= =?us-ascii?Q?O+J3LJ2k201YthDWEKdYIfPljVuazFCvNf5TCCRCuVeR8hwk8q7KisDUFgrI?= =?us-ascii?Q?xWIIPKtdXXPuE3n7FmX1oRLuusYXpkja8No2xvpBPLggigodGlqYzGHmlUHh?= =?us-ascii?Q?7qRjbREQ/xEXOiU6d4RJHSd5e0H4k6ABNoCrDs2F5p30maG3l9sN4ZpQjWTA?= =?us-ascii?Q?2AIxmjxhjAkSoD794BI7WAGRA2nz2hdKYRSRN/c4X3cikaUyRxKx7WJsBNcH?= =?us-ascii?Q?k/rrGpFzZvoNt6EkedI7PVKoWEAAys8jhVk0sbS0qjzB+Acdji1qjbu7vsju?= =?us-ascii?Q?Y9E1gKeN1rY5M1wfV6+gY6VnkLFMQvxDAVCJdwnXXydBnQEW7q9FLzZQ+NhZ?= =?us-ascii?Q?6t7wXWodvwJ8xAoyZ9de/LgKI3sIJKMlYAyv7k+USBH3yswuNmQWVU456Wq6?= =?us-ascii?Q?7QJGpBye+UKI6tKGpWiT9bs+b5oHDAh2BLpZQx+69N6WWviUCpBt9d3ZNgVx?= =?us-ascii?Q?jyeK5XbKfp9BfSsP3xcvAibxhZ1DznZIF6gDLymqfjg7/vZqbsBt61wueZdn?= =?us-ascii?Q?vtWdKxJ57q9kuH8Z5g24/Lz/9c/N5C4HFgzfc+tRJdoovE7LeSPJXkE+8Hzp?= =?us-ascii?Q?0mT8SxCP0YGSVIkz486VCZk2sviTwWZAlNwDEa5dF9zQS/B4uoIIXgptSEkF?= =?us-ascii?Q?j4RqeLyF+xcyd9V3h4hxAFyGqJc+Yz+7jNAsNhsd+Ltv66gk9pjoLz5J/d/i?= =?us-ascii?Q?SqG2q3bWO/TAFtdcUP8rzbsPvZqv9MiqaOGIDp7LkYQpG5+azCGakkpAt/HZ?= =?us-ascii?Q?6nUBhIB6z1mbQ=3D?= X-Forefront-PRVS: 0375972289 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB2439; 23:yJGDH23y6cZqTwEbLUKXWEktmx5JLN1D+XmxgEJkm?= =?us-ascii?Q?dM5B7FrHQTlNIWt/S1/XYfXEUpWphZuP/EaGw4lW6wJUn/fvXtoZQhjcfvx3?= =?us-ascii?Q?n74HWKPp7YDLS7XOECfX5SfDkktuJ15QzQfkDA2tCqW4hLDc0eskH3HcdYto?= =?us-ascii?Q?oX6cqlRFgZ9d4hiyfALj7RG508u/kUhbf8rocttBPhww89pAv9kpVbdf3bK+?= =?us-ascii?Q?hGEMsoqThDba7wdU4hq0DZ7m8B3p+nMbkPHfII2PcuVL30Xx0t+6t6nQGuoH?= =?us-ascii?Q?eaossecFUa930JynzeE19LghTat76t3pWAN/BXQiFLNFeJOBLteUVuw/L/xK?= =?us-ascii?Q?nUlb2b7hWdfiy38WYLp4w40yqpuCZ5G7AECTWaA4yWj/95Ow/xz3EAnMpNYe?= =?us-ascii?Q?Sjot0eIDIopw14WYikwdxQWKw37RS0VYfKtga6zciShKwVh7cW1D7jMO9VdJ?= =?us-ascii?Q?SSOND5tXcYIL6znTw4gBGyiMDEFHsUNk0VNdZJOG1NACq7nrc3JxbpIXGr9B?= =?us-ascii?Q?RxvWGjMndjNmGu82CCQJIwScEHN1pMf/ct+ttICyeKvMuleVbEVTP4Djasp0?= =?us-ascii?Q?nEVFSDglzA9TvUVP8JmEaBEA64jGkpq1nmVC3njAvc/rAIZ0FEhEojAImL5A?= =?us-ascii?Q?nwQgjeciyu1jw4Qjqgi7QV5aJjAaePjsIJm7oghD5xZl8nxgD88MITSsYqGY?= =?us-ascii?Q?Sa4MZG8D7LUjT+qrpfaSOv6ZP+I+HTAYX+WBWsOAmOnNiucSDWbH9cKJipkQ?= =?us-ascii?Q?UxsakrM6pH/LSzPBNKibmga+gu5V3U6WWhraS/PK/hXJJcU58AkSQLbVlD6K?= =?us-ascii?Q?nOiahWSMYmEuRqLs+ElTrVRNySBO7Ni8Q14eLOVHQV6PbT34aEU0PMIMZ7jl?= =?us-ascii?Q?ffw5pAjsohvx9VDUAqNnNRQWiAauzPKmm0DYYeF1Fo9XpX+IwQOZDWBluZFt?= =?us-ascii?Q?7Q8opMJdXjMFByTffK4z+/cfG2W/O8vCa3sYiDla8ArGw4fv4hYXvxc+FWTw?= =?us-ascii?Q?9MwsDH7FkBld8X0/ETiatENiz2OmjlmvR6TwHbRMZ8tJNpR1rsxbV9fQAt72?= =?us-ascii?Q?7RPoN7Z0XW/CYtzh3e3/rWpJEIxKFhE0MdEyM6uBgs8oGopIj1ER+FhJoKEN?= =?us-ascii?Q?EyGb0El6HIxKpJaZuo2dl5sheMhjmyZ?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB2439; 6:Npf1zTeruRhWFoz2Q89s9xCXViu5MKhGppQJ/9WWcR?= =?us-ascii?Q?tUZorc1Oon51WC+y4q0rxdaeqIAZ1mi+rbuzfWuH1ojvYFlMApq8ET8ZdUoD?= =?us-ascii?Q?lWRfQYIVJrqsDncYMjsxabDXOLjtehk+jXJPXTOzNgZhOe0wNNNJcRdKFS9d?= =?us-ascii?Q?RE65ZnPP1MprVAbZshgIZoaenw2eyCXRDG3LW30X5NsqvaoQRwVrT+o/P6q2?= =?us-ascii?Q?ld/0KQek+XWZJJsC9T+aIGbJ1QJGU+lMOO4DLQ5o1YSNWkySkOQHx09hCREb?= =?us-ascii?Q?xj7YgG33nnda4lfA2P7GMIpYXmOGyqRYpNTViZfUwSv/Q1QqYlpAhANkWmQT?= =?us-ascii?Q?izyQbahK2V9zI9jG+8k9l8/6PINM3dj6zA5lNpbxcsgdWy3VujHdzfoThJcx?= =?us-ascii?Q?75nHcWvt1rFSsTPne8XOWuz1wzM0tkngWhe5Cznq47dOTgeYEAS1r/iTvLwt?= =?us-ascii?Q?xg1tIeOaFtpI23gHqAnieyifCkvsUHiLKYPxE9gMnjMgxDTzKI2y2Ad+hW27?= =?us-ascii?Q?aYA2Rtw1O6fA467espbkObq5TkDoYrXz0pEFaqT2g/a8NWYPIUdjZ1Yb1deN?= =?us-ascii?Q?1PqVKamIBxFc855PZP+A3ZyxYjwzFMpyrckmbtiF6dyfraKSst9IoBeOwOPK?= =?us-ascii?Q?fjzE8kYSldonx7i5TDyhyQyZsOAPJJCxgRgNcU33zH2zS5hpKWGOGOHNjfEb?= =?us-ascii?Q?ArJuENsamhwKaAJOPOch5ua04jlxK5xZYhQj3n5hExs/LfiwX/6eGz9sCBcx?= =?us-ascii?Q?HkvMsmK6ApeP3vVWxfSd8iyN2faJKaGYS0uEdlyfgYFpuxOsTLnwwaQstekI?= =?us-ascii?Q?mV+CrsuS9zKjlmImdN5WWGWHKQo+truz05cUD/1NZZFWqlCeVrR+FZulyH7Z?= =?us-ascii?Q?UL8MOZrQanaCXXqCA8JDNP+SBXg7VlgLesIG/dI79hIyjYKBl2ujHKDQ9yfM?= =?us-ascii?Q?3JhfjLa02YprkNR7kkfCoq/qhxfgEEAuf1jkOiHzde281tmwOOIC5Btq3Csp?= =?us-ascii?Q?Y=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2439; 5:dSh4T46PM0bkc2qzj9RrKqTFp1nAHlkb9hm0OWEQ31XjeMibK5nmu7GrK72uSNplydwyr/ofADpk2lfCU02BzxIfvyUHPzDpNwAZPggc5s3Wor9MAnGMx8NsEW4/1oMQHAkKnBInD+GR5YFUUvVjWxkKfuVM/gnWjV4noeUT//jR+hvFKdvpLP83/3Fo7/TWYMtjPfk6UGL1wEfNrSg0h6ycXaYRhJELmpU10pG6JFGYve8WqUCOEayqKYqiIZ8YF0e87thn6czk6NEavBw48qOEn7vL113DibZtwNbF32+Qhk4o5NsuaHAMAxrC39oA6mpwC1dSE2Y0IdyG/dVQx/KZjmHqbxCcfe2ua+FoHqbT57n3fyWvlGESe5fxb7YyGN6sARsZvue9rC0TVbbXIyh8uEzQlCTnyxRGegNrO0KPVRBpiTRugUM5YjA+BYvDVRVdXWF72HRbc2aLplesN7moqFz7Rm8yc0d5VVIF+pxX6pKXoU1ahhAvOumBYO31; 24:poudAmeAXBTdUt+EI4cTRrVtA7nKnLiz3juJZFEK9ekHOlACanvkkWwR5/iV8bmgm2lEF28Xia/sTv2Ey8AQaOqzazWuGdVzu4CUCRFFP1Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2439; 7:hyXV6J7jcpd8ZHxzgPpExq3SyIPUcDUAuKSW8w+pLAviJn34OBGtn4kC+DonAaG0T5hjczsYAque2NrUK6/dpu9jYeu4iBiYUv1d8K7waxBpVBRYHmuRMSXgCRKFgPy3Kco+5k/Whu4YzYwf3nvBQDNh7jFwm8GQL7ctprM7A03BjH0irtcJ3mBoPscaBJ5wKDI3f7JSuPMfFWqzrFeSDgZhY99vyEeI4jMo+rpHgJNbyuE5BO6UF7WFFANBC4dsaU+isJHHNLkPM+afXjgH5x4QbiWs0EVz0sdhcHUtTlC5akmRpYYz8tdlF8oc4SIXKUSU/Zjr9RaeDp9jl/JIVLG1d/wtS2szJXy8cADgJVwEWw+Uu5abEWTSVtEraDxTSmiMaH1CXbbSFN90OonFSiy253qZ0MOBT19PNBCJReAtVLc3TCwX8n6V0TTayypgOT9HfHC3kvCdpb/3kqYGC3kmubABZAgRdQ9cBkSvOelKldciPQCrl+HOvqfYWzVMviZi/BMzzZmdXZ6qXiDgmdI1kt+sz8+mrzJQbSaw8HB8LqHMfT/6trl6HcID3iRN+kAVfp0d+HULUSbfVikM28SDERMjGUKkze6ZfdpBKDReh1ITReztVgymVq5A47PSfXtQr2pxpzJGarIZ2cGyhX6bHHKFlYD5FqgcoS9hQ9xCGoWBeI/pYlQWthWqG8z20IFykSrBiwP9b0GHtNkMFxwxReqP5iRdxRFS7zKJ/utuKYbrldOgzmT75stSUT+SKKiwMo93esxumq4xD85erD3VBiZ/GjMlTZL5URg8XmI= X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2017 16:32:33.2220 (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: BY2PR07MB2439 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 does not change any functionality. Following cleanups have been done as requested by reviewer - Changed waitQ --> waitq - Collapsed multiple debug statements into single - Remove extra parentheses in if-else as per operator precedence - Remove unnecessary casting 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);