From patchwork Thu Jul 9 14:23:02 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: 6756411 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 DAD53C05AC for ; Thu, 9 Jul 2015 14:23:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D022C20380 for ; Thu, 9 Jul 2015 14:23:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A33C82035D for ; Thu, 9 Jul 2015 14:23:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751296AbbGIOXL (ORCPT ); Thu, 9 Jul 2015 10:23:11 -0400 Received: from mail-bl2on0064.outbound.protection.outlook.com ([65.55.169.64]:42525 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751081AbbGIOXI (ORCPT ); Thu, 9 Jul 2015 10:23:08 -0400 Received: from BY2PR02CA0111.namprd02.prod.outlook.com (10.163.44.165) by BY2PR0201MB0744.namprd02.prod.outlook.com (10.160.124.26) with Microsoft SMTP Server (TLS) id 15.1.201.16; Thu, 9 Jul 2015 14:23:06 +0000 Received: from BN1BFFO11FD003.protection.gbl (2a01:111:f400:7c10::1:117) by BY2PR02CA0111.outlook.office365.com (2a01:111:e400:5261::37) with Microsoft SMTP Server (TLS) id 15.1.213.14 via Frontend Transport; Thu, 9 Jul 2015 14:23:06 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.173) 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.173 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.173; helo=milsmgep12.sandisk.com; Received: from milsmgep12.sandisk.com (63.163.107.173) by BN1BFFO11FD003.mail.protection.outlook.com (10.58.144.66) with Microsoft SMTP Server id 15.1.213.8 via Frontend Transport; Thu, 9 Jul 2015 14:23:03 +0000 Received: from MILHUBIP03.sdcorp.global.sandisk.com ( [172.22.12.162]) by milsmgep12.sandisk.com (Symantec Messaging Gateway) with SMTP id CD.1A.06265.7C38E955; Thu, 9 Jul 2015 07:23:03 -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, 9 Jul 2015 07:23:02 -0700 X-AuditID: ac160a69-f790f6d000001879-7a-559e83c7a45d Received: from [10.50.231.57] ( [10.177.8.100]) by milsmgip12.sandisk.com (Symantec Messaging Gateway) with SMTP id AE.3D.04661.6C38E955; Thu, 9 Jul 2015 07:23:03 -0700 (PDT) Message-ID: <559E83C6.80701@sandisk.com> Date: Thu, 9 Jul 2015 07:23:02 -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 v3 02/10] qla2xxx: Declare local functions static References: <559E8382.6030803@sandisk.com> In-Reply-To: <559E8382.6030803@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsWyRoxnke7x5nmhBs9bJSxe/HjCavF//W0W i+7rO9gsrt14y2wxf+ZfVgdWj8M/fjB7rPtygt3j8ya5AOYoLpuU1JzMstQifbsErox5B+8z FhwWqbi95SRLA+N2wS5GTg4JAROJj/uuMUPYYhIX7q1n62Lk4hASOMEocX7hMihnO6NE38pj jDAde9dehkpsZpTYd+k0WDuvgIbExM9X2EFsFgEViY7XR5lAbDYBI4lv72eydDFycIgKhEns 2aMKUS4ocXLmExYQW0RAU+LK0rlg5cwCBxklfn1IB7GFBRwlbnesARspJKAlcWziTLB6TgFt iTeTF7GBjGQG6l2/Sx+iVV5i+9s5zCCnSQhsY5XoX3ieFaJXXeLkkvlMExhFZiFZPQuhfRaS 9gWMzKsYxXIzc4pz01MLDI30ihPzUjKLs/WS83M3MYLjgytzB+OKSeaHGAU4GJV4eBt2zg0V Yk0sK67MPcQowcGsJMKr5zkvVIg3JbGyKrUoP76oNCe1+BCjNAeLkjhvb65OqJBAemJJanZq akFqEUyWiYNTqoFRdGt9pOfvPO/VoX7nc1z8Na5dluZpXHdY18PXSHw661RGFs/uQ4xPWMV3 Mp9cWjpb79LNhmurFArvpmQ5cv3mOn2A7cQ2o6KFOXeuN09UeH+m4vlEuxv7Bef4ccUvn/iz K68puXTvlgqxsy/F0lYXT7Op2MqcdPFuiNVG433eUyeuEhbPqP+sxFKckWioxVxUnAgAI+mM l4sCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAJMWRmVeSWpSXmKPExsXCtZEjRfd487xQg5YlXBYvfjxhtfi//jaL Rff1HWwW1268ZbaYP/MvqwOrx+EfP5g91n05we7xeZNcAHMUl01Kak5mWWqRvl0CV8a8g/cZ Cw6LVNzecpKlgXG7YBcjJ4eEgInE3rWX2SBsMYkL99YD2VwcQgIbGSX2Tn/HCJLgFdCQmPj5 CjuIzSKgKvGqaS0LiM0mYCTx7f1MIJuDQ1QgTGLPHlWIckGJkzOfgJWICGhKXFk6lwlkJrPA UUaJScsbWEESwgKOErc71oDNFBLQkjg2cSZYA6eAtsSbyYvADmIWUJf4M+8SM4QtL7H97Rzm CYz8s5DsmIWkbBaSsgWMzKsYxXIzc4pz0zMLDI30ihPzUjKLs/WS83M3MYLDlDNqB+P1ieaH GJk4OKUaGF3v9y/lEsm7NMHO6uK7tXeduVJzn1yMTHrmFjSJ0/Gf2Z8S7/bvxt68V/2kVkad 3XxkNVeIiryguUPjrbkx+SUJJ7eWLvp5xz3J+dzyn1PmGPVOFv6bPU1dbUH4uiOPmNdfzDBu ke/pC/Np+nUvtpBhp9dWpv2MnCfEa4ujOZeqtV5VWx5prsRSnJFoqMVcVJwIAInYEd8DAgAA X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD003; 1:08XRn6yrQ7xt4Oge8KATkeEjGP0KiV9BLMr+4hgiU2zoMK/WYLegyz5sqfsq7B3B4SHn9UrKpRIbzr0Z4UQircYOvsIlCblJtmh/D4sEQALf9bPtMFtHaPkrOVf4c0xVfbGtHHojPPfAjTRRHv3ggC5ELv9S9XDbDuFRcwt0cUQG8llafbmHTy86/3hzS2XdWdPdC4srr3z23SZT2NVodY55Fgi7HRQRO+A9IvMrxllv/oKjFdcMIpYiyA/ag+lPIdOpiwanjgxVBHo3O7TczDII6RXxemU/nqHv78gy1siC9eElqdiQAiQC2YVzZumk614QGxOq032An2I/GjGZUavY6oSbIeb8PqMyK1Npt24j9nJVaxYeWTloacS3z23NmvhPR65DdC4GN6PgHNA41clDQVAMeCbhs7pSNx/JVNA= X-Forefront-Antispam-Report: CIP:63.163.107.173; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(2950100001)(106466001)(229853001)(33656002)(83506001)(19580395003)(50466002)(4001350100001)(189998001)(77096005)(110136002)(5001960100002)(92566002)(50986999)(575784001)(86362001)(87936001)(64126003)(77156002)(62966003)(54356999)(65816999)(19580405001)(76176999)(46102003)(36756003)(65956001)(23676002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0201MB0744; H:milsmgep12.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0744; 2:rEZSBLx/jEkVLvYIJeH3sZvDwdXmhXj5jDqWcs8rEa5p2zy0z3+A1KkE3Ke6UfkE; 3:5caK+kTR/M2LQNfvT54QXZCs+/dxcDQIoXFN+RAad4s/ijj9TJ1SjJjwyGvvKxvJ3Gb7xvot5KxuwDTH4h7Uhd34awWGlz13G6xNoTOvEwf2DyfItMwK6yUjZjUXrwvlJqPEjcPuI5h7x/uzFXw9ImARjZsMPjmJUlfaLykFnJkmECLPOvpwPvH5lJ2//IpBFOJSnivvtwEIG/ke4vCaCPGnhFUFbmMouwM50oOFIZ79ugkMXxir2dxGlzN74aQe; 25:sPQxDaZJ6GoHBMWnBL7/HTlMzSPFAr70elVrkzMRVCtfhkt+6XeJ/36ThTOU5Mn0MUjrtm0uun2fsQXPBW8NtodUfluLn9O/1ELFp66dCiGKhtY9YxiL6yXPWsA6xCjGqDteEURpH8a0tt0pKxa7d/Vjl31gr5FkURV6MQn0tpphAkBv0+Lb0YeDe+ygR1N8jN/TdADmUpbLDxxTuo9cqhYcJhOPlicy7ate4Sg+o1n8KvThQXhq9k+iqcHuyRfU X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0201MB0744; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0744; 20:ne0Iwyl4Iy2X2cKUJ8/ZJXbd4tx7tHv7ScHhSK+5sTFCp/h9MY/tlqtlNfz7xdbnMH8yv1Lo5olnRwv0Y3107NGRoACT3ggSpoErKTOHGpXgmTefte+7K6It0MRV8WnToqq4jyfyvJuUR+kyMGep8TOfiGF8KzczvOVWDfAMm5q/z9r9JvvM00aj5eUwhic9f3DpGIU+FjdC3ckRP8yVbJxjGCUexY0WNfMyL3HpNByrZHBHLzHXDwYwlA2rg6ogq0m0OkRjCoDL7iYEyEWqqYZFxRByn+clgXJoQme4BhNgYyaBbhuB2GAV+q6j0znxABWd0LyV/L/sJyHhVTsKQWacwcPsgHMtqsYP6aFYPiH+r5naDn4ZVubUSo0xBQLJvYwIvouHwBucfLhkr7CJ1ryFYETB96aGmm+9f54uumW31CRr/ZrKCi81pUvkTcFg0bpp4YHjlmIM9JXtq5FRbSgZRl6KpQScevR+Vdy88xZgFOR9Nsi4dJYxbxKHFX+g; 4:95Tl3nrInCigQ7PtcDTcT8A4Eec/kTnX29uTJzqcCQJtbvgJEMS79os+RickfxPD7NvEV0MxdFeuRD7uqDJyQvEnKmyHI/Fu0spiBDDn72g/zcdzmoykNQMvbLOhqeSkC2RhGiRNdJ6xlnxF9YlshPQ3QfKjpkxTjSvKxfnRQ6gcJQh6p4cuWVqByHhh5GOcz+yXEj1A151opsKqE6gLYyEvzlspfQmO+UPTyX+NLqMDUKtUj1/B9CNPwC2N8jY2M38QSI+4SFAR0M7jkML/WqanhkmfBl1R3BgWhDNuwRQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY2PR0201MB0744; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0201MB0744; X-Forefront-PRVS: 0632519F33 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0744; 23:7WAgiQHQxVWTgf1KgQngLcC3ZqzgO3Nb5d5xllJH8n59o5hD1oy3e6siJ3+0P8j8DIBI7V1k5wyWenP+jCYN3IFIdq7Yn068weN2DJ/KjSggQdo6+a7QKS3pjh4qaUTIu4ic48Sx8KmyZWAR1b8P9Lf8ZZ4Vwd/QnnViCDLXDP9N6c2leQi0hfU4/RhZrhV1ZZ1GohlaVzTk4hHC6n0nFMyHpIAo4Zo36VWwHiXBZMLUHdSkbhyy/Mo2GMEb7jJHse1On4CZH0zanpU8thkcEQlDQvHTMiNPDoFBrKdUbCfIfAbCLBh2sg6D5Z4DSJqWykhPmnmuRhQ7VAXwiH4oPc5ddRODlXkCwWiQ75KYkwN+kdnU8632/G6VAPQY7tO5w0moxEtlEKSnVqpv/qOyukDPDmM3UaS+8lRjaYv/gNt5u9oDLDttI/uAuc2Z2LV3gkwsgPlmL/mBqg14O1B6T1KavE8MCOZ81Wnjm5mHdTJFZtDOL42zBvbb25s9g4pgYM0vKL30WdZ+8+rPhZVVh3Hdvw79aQoaAUP+m28dhW0PwWhk86lUUcTn/Y2aNIrwIYyd9/RISV2FqqqnAEJdt6yQs1q/6CRlZjQqOgtn4uft8LpcFdixUS4xe5JCKpPc0zn0E1ph/PVguDQKcw8+F/oufpThSIywsvlbePHr/78ViJ4Y3juA8fe1jRPsslOxHFvso4c0V0R1fm4giGBFKBHST6Lc1iPjEvB4iiVFiZwnzwwLY0rHOIlU1xwZAnhNZJkLKkaDBhcjt8wLgwG05Y4J0P0HOicjte5t71CQy7kaWs99xVS+8sOCfQQ8UJk+AsWDUyxqTHWRMFOULCVar1EfIZJjh6qxApusC3BK/OUbOdk26nI/9qARtc2VO/U9 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB0744; 5:NHsQoeSGCCzd1Sj5/gj47fJI353ATybaL0rY1k0btdpmgEyD51ahrFm9gu/Gc+1u3DlKukkxpLrcooi4tfzI8nyiOrSckLzyuInzZyZuZ+VJMpNE8pN4+wIW7eS42ilXfRObtYmpdLCI22x25xtNTg==; 24:WDqhivg1A/zMAEbmGdCJrWpc5482/Jj40+y8qycjPlZAbUhAYW2RuedrfpBPfnHtyMs5walp4Byjr9c9LBj3GYrlXTtS0twFZsbyKQoblUg=; 20:M+mNPzI0mynvl7wrSTGo354bHoL58ymH0wgtZhs9kKLCRf9JnqW7+VPlpht+CFzS16P4aqB0Q0ce9JvF5tE6MnZnfCc0RxnSAzqJNVHlpMAEJXcxN9MuzqFXp9aS6SStu+WKEzOgprJ5CWUcMvuA3EJHFIFOpxZQc0J2F2FBZwQ= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2015 14:23:03.7483 (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.173]; Helo=[milsmgep12.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0201MB0744 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 36fbd4c..d58ffb7 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 1620b0e..47f8419 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 000c57e..e06c851 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;