From patchwork Thu Jun 4 22:52:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 6550401 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6CE80C0020 for ; Thu, 4 Jun 2015 22:52:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7EB2E2041E for ; Thu, 4 Jun 2015 22:52:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2074920411 for ; Thu, 4 Jun 2015 22:52:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753964AbbFDWw4 (ORCPT ); Thu, 4 Jun 2015 18:52:56 -0400 Received: from mail-bn1bon0082.outbound.protection.outlook.com ([157.56.111.82]:43184 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753931AbbFDWwy (ORCPT ); Thu, 4 Jun 2015 18:52:54 -0400 Received: from BN1PR02CA0022.namprd02.prod.outlook.com (10.141.56.22) by CY1PR0201MB1545.namprd02.prod.outlook.com (25.163.139.24) with Microsoft SMTP Server (TLS) id 15.1.172.22; Thu, 4 Jun 2015 22:52:53 +0000 Received: from BL2FFO11FD006.protection.gbl (2a01:111:f400:7c09::152) by BN1PR02CA0022.outlook.office365.com (2a01:111:e400:2a::22) with Microsoft SMTP Server (TLS) id 15.1.184.17 via Frontend Transport; Thu, 4 Jun 2015 22:52:53 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.172) smtp.mailfrom=sandisk.com; qlogic.com; dkim=none (message not signed) header.d=none; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.172 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.172; helo=milsmgep11.sandisk.com; Received: from milsmgep11.sandisk.com (63.163.107.172) by BL2FFO11FD006.mail.protection.outlook.com (10.173.161.2) with Microsoft SMTP Server id 15.1.184.11 via Frontend Transport; Thu, 4 Jun 2015 22:52:50 +0000 Received: from MILHUBIP03.sdcorp.global.sandisk.com ( [172.22.12.162]) by milsmgep11.sandisk.com (Symantec Messaging Gateway) with SMTP id 47.AA.04667.2C6D0755; Thu, 4 Jun 2015 15:52:50 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.224.2; Thu, 4 Jun 2015 15:52:50 -0700 X-AuditID: ac160a68-f790b6d00000123b-ad-5570d6c22352 Received: from exp-402881.sandisk.com ( [10.177.8.100]) by milsmgip12.sandisk.com (Symantec Messaging Gateway) with SMTP id 6A.65.04661.0C6D0755; Thu, 4 Jun 2015 15:52:50 -0700 (PDT) Message-ID: <5570D6C0.1020800@sandisk.com> Date: Thu, 4 Jun 2015 15:52:48 -0700 From: Bart Van Assche User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: James Bottomley CC: Himanshu Madhani , Quinn Tran , Saurav Kashyap , "linux-scsi@vger.kernel.org" Subject: [PATCH 01/10] qla2xxx: Declare local functions static References: <5570D656.9050704@sandisk.com> In-Reply-To: <5570D656.9050704@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKLMWRmVeSWpSXmKPExsWyRoxnke6hawWhBhvfy1q8+PGE1eL/+tss Ft3Xd7BZXLvxltli/sy/rA6sHod//GD2WPflBLvH501yAcxRXDYpqTmZZalF+nYJXBnPWs6w FxwWqbjabdnAuF2wi5GTQ0LAROLFpOesELaYxIV769m6GLk4hAROMEo0TV3FAuFsB3L2zGTq YuQA6/j0iRsivptRYlLjIXaQbl4BLYmrt+cygtgsAioSP+dOBLPZBIwkvr2fyQLSKyoQJrFn jypEuaDEyZlPWEBsEQFNiStL5zKB2MwCBxklfn1IB7GFBewkZr08CdYqBDR+wkFlkDCngLbE 70/nmUHCzECt63fpQ3TKS2x/O4cZ5DIJgW2sEg8fLwG7QEhAXeLkkvlMExhFZiHZPAuhfRaS 9gWMzKsYxXIzc4pz01MLDA31ihPzUjKLs/WS83M3MYIjgytjB+PWSeaHGAU4GJV4eC2O5YcK sSaWFVfmHmKU4GBWEuGdu6kgVIg3JbGyKrUoP76oNCe1+BCjNAeLkjhvb65OqJBAemJJanZq akFqEUyWiYNTqoFxRvH6M7ZnNP/f+x29zLdaiefwh2eHTvDbOpbn+lUdfmh6usFXtHDphlN9 xxTnz09/E1FxiEvdrCr307b2G4vOV2ycJCpWue9kuKX92lXnDASX3nNKerlw4cJ1AQIaa5bv Nfobq9274xj/5Jir3kv+uLjJrP4g/6w19aqct+m1Pzcme95iy+joUmIpzkg01GIuKk4EAEYT Q56IAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLJMWRmVeSWpSXmKPExsXCtZEjRffQtYJQgzOfBCxe/HjCavF//W0W i+7rO9gsrt14y2wxf+ZfVgdWj8M/fjB7rPtygt3j8ya5AOYoLpuU1JzMstQifbsEroxnLWfY Cw6LVFzttmxg3C7YxcjBISFgIvHpE3cXIyeQKSZx4d56ti5GLg4hgZ2MElvfP2MBSfAKaElc vT2XEcRmEVCVWLPlNzuIzSZgJPHt/UwWkDmiAmESe/aoQpQLSpyc+QSsVURAU+LK0rlMIDOZ BY4ySkxa3sAKkhAWsJOY9fIkWK8Q0PwJB5VBwpwC2hK/P51nBrGZBdQl/sy7BGXLS2x/O4d5 AiP/LCQrZiEpm4WkbAEj8ypGsdzMnOLc9MwCQyO94sS8lMzibL3k/NxNjOAA5YzawXh9ovkh RiYOTqkGRgZ2V5b1qQF7Tzh+WrFnk5h+1NPdZYyb/tvkyYsK3+LZ6xH96JWBD0u/nh/vUb1T Ka0+Ept+rHy2pl1Drnptpo71Dn1Xvk89W1JMV+cb5M3pk76wuY7xqkkCx2vVd/U/1+kLax5k LXyfdKVcq2PR15KN9x2OC16c7m0k67KFT/TV5KoZ8QGzlFiKMxINtZiLihMBW/iG7wACAAA= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD006; 1:0EUlivMVcKXzqZ1eIsW2UiE1bTq3yqubWkphyCmpiJazUFWOm2jXdgY0T0stR+rAF3QYrlLuVzNnGVAB92VvwPRE2hFrf7CO4oP7DK4wQOiHmfc5ue3SWIbU7wnSbEGmJFd2oEQF+Ip0wGgOOx+E7Ba9VKyvFNaRtX/pt9pzal3fEzvydMbzJfFNvuaK/ZsvkbTJSru8H4pbAgVB3gfK7CJo8AugA2hSyU8ZTZeri2Oww9VEPt+DPLxZKSQp6Nn7443QjHT9FlT4k88XJlAdUmrLUBnXxF0RMja3t6hjzUiKvyq5WtVNXKMCBQ8C30CVGRFTJl6H1w7cg8lXzpRGVQ== X-Forefront-Antispam-Report: CIP:63.163.107.172; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(438002)(199003)(189002)(47776003)(87266999)(65806001)(50466002)(64126003)(575784001)(86362001)(33656002)(36756003)(53416004)(229853001)(92566002)(50986999)(19580395003)(54356999)(106466001)(65956001)(19580405001)(77096005)(83506001)(2950100001)(62966003)(23676002)(5001920100001)(76176999)(110136002)(4001350100001)(46102003)(87936001)(189998001)(77156002)(5001960100002)(65816999); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1545; H:milsmgep11.sandisk.com; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0201MB1545; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:CY1PR0201MB1545; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0201MB1545; X-Forefront-PRVS: 0597911EE1 X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2015 22:52:50.8706 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d; Ip=[63.163.107.172]; Helo=[milsmgep11.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0201MB1545 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Bart Van Assche Acked-by: Himanshu Madhani Cc: Quinn Tran Cc: Saurav Kashyap --- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- drivers/scsi/qla2xxx/qla_iocb.c | 4 ++-- drivers/scsi/qla2xxx/qla_nx.c | 2 +- drivers/scsi/qla2xxx/qla_nx2.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index 2e2bb6f..e1c2a57 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -405,7 +405,7 @@ done: return rval; } -inline uint16_t +static inline uint16_t qla24xx_calc_ct_iocbs(uint16_t dsds) { uint16_t iocbs; diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index a1ab25f..fb0f514 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -680,7 +680,7 @@ qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt, * * Returns the number of dsd list needed to store @dsds. */ -inline uint16_t +static inline uint16_t qla24xx_calc_dsd_lists(uint16_t dsds) { uint16_t dsd_lists = 0; @@ -700,7 +700,7 @@ qla24xx_calc_dsd_lists(uint16_t dsds) * @cmd_pkt: Command type 3 IOCB * @tot_dsds: Total number of segments to transfer */ -inline void +static inline void qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt, uint16_t tot_dsds) { diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 7d2b18f..ca2f8c1 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -2298,7 +2298,7 @@ void qla82xx_init_flags(struct qla_hw_data *ha) ha->nx_legacy_intr.pci_int_reg = nx_legacy_intr->pci_int_reg; } -inline void +static inline void qla82xx_set_idc_version(scsi_qla_host_t *vha) { int idc_ver; diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c index ed4d6b6..d804d82 100644 --- a/drivers/scsi/qla2xxx/qla_nx2.c +++ b/drivers/scsi/qla2xxx/qla_nx2.c @@ -561,7 +561,7 @@ qla8044_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf, return buf; } -inline int +static inline int qla8044_need_reset(struct scsi_qla_host *vha) { uint32_t drv_state, drv_active; @@ -1605,7 +1605,7 @@ qla8044_set_idc_dontreset(struct scsi_qla_host *vha) qla8044_wr_reg(ha, QLA8044_IDC_DRV_CTRL, idc_ctrl); } -inline void +static inline void qla8044_set_rst_ready(struct scsi_qla_host *vha) { uint32_t drv_state;