From patchwork Thu Dec 21 17:34:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghava Aditya Renukunta X-Patchwork-Id: 10128145 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 5FB9860318 for ; Thu, 21 Dec 2017 17:35:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DEE629CE3 for ; Thu, 21 Dec 2017 17:35:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42D5D29D3C; Thu, 21 Dec 2017 17:35:52 +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 9CFA029CE3 for ; Thu, 21 Dec 2017 17:35:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755162AbdLURfs (ORCPT ); Thu, 21 Dec 2017 12:35:48 -0500 Received: from mail-sn1nam01on0059.outbound.protection.outlook.com ([104.47.32.59]:30848 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754687AbdLURfC (ORCPT ); Thu, 21 Dec 2017 12:35:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mscc365.onmicrosoft.com; s=selector1-microsemi-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ZGOeO/jy2cj4adU1/kPGR6so5h4X74zpuXfKqmJVWI0=; b=C8CL8JOEZb5qQSoDvzWiQXSdEzJ4jQmjNsY5Q+xi/IpXEajB4fuSshQpG6A23OyNMax+ZcXw2qcp3iWLnxjTuvIMXAOOXZxMy3qFs7vgexn3ErfRDnXZs8gFa68c4DeGZNK91N28jCHLB39bSVqvGL8A8FxqcaC4AK8IT7K6uQI= Received: from MWHPR0201CA0061.namprd02.prod.outlook.com (10.167.160.38) by SN1PR0201MB1837.namprd02.prod.outlook.com (10.162.228.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.345.14; Thu, 21 Dec 2017 17:34:55 +0000 Received: from BN1BFFO11FD012.protection.gbl (2a01:111:f400:7c10::1:183) by MWHPR0201CA0061.outlook.office365.com (2603:10b6:301:73::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.345.14 via Frontend Transport; Thu, 21 Dec 2017 17:34:55 +0000 Authentication-Results: spf=pass (sender IP is 208.19.100.21) smtp.mailfrom=microsemi.com; linux.vnet.ibm.com; dkim=none (message not signed) header.d=none; linux.vnet.ibm.com; dmarc=bestguesspass action=none header.from=microsemi.com; Received-SPF: Pass (protection.outlook.com: domain of microsemi.com designates 208.19.100.21 as permitted sender) receiver=protection.outlook.com; client-ip=208.19.100.21; helo=avsrvexchhts1.microsemi.net; Received: from avsrvexchhts1.microsemi.net (208.19.100.21) by BN1BFFO11FD012.mail.protection.outlook.com (10.58.144.75) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.302.6 via Frontend Transport; Thu, 21 Dec 2017 17:34:41 +0000 Received: from localhost (10.181.72.13) by avsrvexchhts1.microsemi.net (10.100.34.105) with Microsoft SMTP Server (TLS) id 14.3.361.1; Thu, 21 Dec 2017 09:34:29 -0800 From: Raghava Aditya Renukunta To: , , CC: , , , "Guilherme G . Piccoli" Subject: [PATCH 28/29] scsi: aacraid: Remove unused rescan variable Date: Thu, 21 Dec 2017 09:34:19 -0800 Message-ID: <20171221173420.8213-29-RaghavaAditya.Renukunta@microsemi.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20171221173420.8213-1-RaghavaAditya.Renukunta@microsemi.com> References: <20171221173420.8213-1-RaghavaAditya.Renukunta@microsemi.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:208.19.100.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(39860400002)(346002)(39380400002)(396003)(2980300002)(438002)(199004)(189003)(50466002)(48376002)(1076002)(478600001)(72206003)(36756003)(356003)(59450400001)(305945005)(106466001)(86362001)(69596002)(57986006)(76176011)(76506005)(51416003)(106002)(8676002)(77096006)(97736004)(4326008)(16586007)(54906003)(50226002)(316002)(81166006)(104016004)(68736007)(81156014)(6666003)(8936002)(53936002)(47776003)(110136005)(2950100002)(2201001)(5660300001)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0201MB1837; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD012; 1:GQ3vIQf2N80+/VxPKiWwS32gFqOCZXkRJqWLGsiZqfeuaKpxNQpnh5VKLZTjYlMEMzcFLgk1dhJioMBRfY4YROspZEKjsFysHq0SLMI236Wh8DXakIezPnHNcZJId+c/ X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5a4b368-1122-4e10-997d-08d548991e0d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:SN1PR0201MB1837; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1837; 3:TxC7hDf4qmmajg1TvdsWiFeHt/T/oCZIJWJW0lTRTeQ/q9OBAoOrM2N8t4IWg+xz8/wKrmQRLxXLvkUZvuwUnLyZh8lm1vZdSyAsucUjrwoUI4RnrRVAefdtepZ+pHYbE51p39OYmqJH/00W40Rxt9EXAchcE7Z2uiVL838XK61oG2TGYUx1xysR+e5L31qkBeU25xwTqkKazOYdNsj69cm8L8o98zyPysFIFV9GoWfvmoD2wLtPxLG2sTqn3/IJ7ru6gD/P20wyu7gEk2Zm/z6n1FwfI5zMSpljA3Qix9yeyLGj7S85dvsnBY8Xg9bnUVan82FCLp4MVa+cnLjtZOT3Ugw26qrC05+wbyD33rI=; 25:UY9qpPlmWCZ93nkhusBs1bvpQwR12mmDOi2NPVt+wgQXdF/NUrD2knx5TG9ZhI8SlYOGD3GO8AjywxwjVC4qayQFjIH25A4cMYA+rnrZa0dc9Q2L+LGcGrs/yuQ4uBF+88FAyHXdohxAYiiUmbO2OMwrPpauwCpmirOdAqJqAoBiVeKbByKZQku8LtLUJy0GhH2v5caAeV4pkB+N6IHz/XYcAl4V7mFynFnZdv/l1u0msbu8uVdZCwbG1aU+nI7elLMpNW1ikABLEJqJhofZKt5aohT7lzMqCh4XEvjfO7YsruF6UfmOrAUgAczeWZ9teAjBXXCcP4QD5jxkUO/HrQ== X-MS-TrafficTypeDiagnostic: SN1PR0201MB1837: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1837; 31:erP7JXPpKOEQzSirsO0gWuS/O4kZcsk45TEetnETzsI8Bmr8trSuS8dWWuLMWGsC8z7/MhX66ww1Cc9moC4cIyArn8Muyvvac0YJVmCXHzpPdZUSWZ8BvzqPvvQOE9cCCxbT/hJJFDKc+hR1mLKWJwRBkJRi5Hqbt5PIJPg8oBXY76Nm+gmJ/HOCH0c9U5AgA1nMi+9J15nmPsPr5RS1iSqqvTyHwdrS04dGEZgeHg8=; 20:qHu8GchYf7bloNbaclqIJKfCqjQzMqRn/ThM/cPXV2D3iukIuKb0J6f830Sd6Yg0E4wkWJ2wOL8xBpiSQaOIB95Q18upoYw+hmVeBzfQJ47A+eOx1Wz0BaqFFSpdBg9jBOtvPOv6G6PvFwERSwI5zfS+A4nhYsdxu6C6sD+PbA6LbR9oGI7D0nO9z5M0qqzCN6r2GWvnRurZNpnBoAcIu+FB4KKwEghEYl9lJsxSENgjdKHVtXhb9n31bcl01IgnpvB8iWiB7u9zGo+Px0kwkIh5hoUKuFA9yJCSSQ//rG3pwtvJGswIZDiPsBXVXclNLsbPMQv7jRGNMWcipzBI+RvGg7QRMMWczreViKlNIERWGAg3wVMr1F9JBWkNQJnfVz4Whwp38cUNm287xq6ZZhhf5Y5l/ez7uHwS+I4nT4ROczZeQMKWg8yQzG2dXaoQ5sVVzAoUuqChOnLaxZnKRVS0al4rmoF5jeGbf3hyuOVTuE3vZavcAohtA1ZaiFHXfZXdy4ZPNfSXLFY1V6/zUFQPJkqZhRRFHIZ0Rjr/Z/VJZXayaWSBMpJ/ZwFI6KkDYqS/D8O3JoZwh5nsw5sLhDtMx+T+t2p0OQwaeYlAbt0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(72170198267865)(211171220733660); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(10201501046)(3231023)(93006095)(93004095)(3002001)(6055026)(6041268)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(6072148)(201708071742011); SRVR:SN1PR0201MB1837; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN1PR0201MB1837; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1837; 4:wOP8FEf5Dte/HXsK2nQSenyfKAWS8wvrGECnCFa4sJ2yfhtP1LvRYqKEU+FLr0EqCxvyOmMGb70RpSNNFAOFRE9HD8lQNDBJyqPJ99VRNNocKZy/t9vTkts/TCSnTWWdFz9TZ2RFR9KPeD0HICHI9excGmOw0LFhnGsJ1hzuy/TDGM3EhYuXtAW3dPz5iIvw331Z2yjqnPdCc/JTKpivwhQU4LgWSxIOSORvDOR/LIj1z8ifpHOdpqDmBQdyc9gfY1zIva+mP4xKTZD7Td7wBIwqXIebOeTExxHeNPYZM5nP1BQ2AUhSSnh1aT743gAaMggFZ5jOcnhtntSY9vjz6akrgbgLGmYdqaUCUcQxGCU= X-Forefront-PRVS: 0528942FD8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0201MB1837; 23:8GDyVhnOg5K2AMSBwZG4v8F8TBwECve1ZrtGRSw?= =?us-ascii?Q?gEU7QJV2iHH9RyrraVuxvrna8P9WvJ/Y3+/wnIpf7koqV5N620vsGSvpnqNq?= =?us-ascii?Q?h8OOTvq/nYOk6RsUUgS93FD86DlgQ68azefYEpBAX5bkk2tYQPryjApHZRii?= =?us-ascii?Q?zPuwx3ETt1JMHIZYs0Hts/5sTmAFKA3TMxwV5ETM355BOX/wye7iOwTCHqxO?= =?us-ascii?Q?ViOerRBccsQ0zq3cPc+EIKWbsYc5Y3AccwTq3uAwouo6ApIPua1ArbAu42G3?= =?us-ascii?Q?Rj9AAC1quaIC2q8p3nX6md44zGhoc9SqLOIyHz6BgmiC92dfyHXQEHHjG0f8?= =?us-ascii?Q?wVZ8mAhX0ZG0NM+MMhWALskVtgpvVZZ9vHJrC0f3Pzl03YwNbjB06nbc1pPV?= =?us-ascii?Q?gyoaw71YtQg/x5zgOE/CqRGNn3dghqwT/tAOWAFkh/qqvHn5qDvlo7fA+ug+?= =?us-ascii?Q?Nm5QsDkFQ9bhX/Fv9XRCDzOyqiMAsH9ameSG6cyfGts7rOXqwpVvfLlZXprg?= =?us-ascii?Q?p6D/UlfPPfzc8L5K4Y7dqGSp30GivzyQXoxVTqW1G5opGp1Y7au1TPW+NH73?= =?us-ascii?Q?eIUcybzg3vgPVE6jsJRhKiO1/CYQDbacKlx8oa2jzTOocKjkYVYBjZ9xJXjc?= =?us-ascii?Q?5RccOzaUxc746wOiU/JlOAeSXmeusQiw2viRCWHc+x9NaXtoZnOvdhIAZ3tz?= =?us-ascii?Q?j0pWemFuRSLurzsk6F5tpegbk4UMbqKRx6JN4NuVyyQPSUzRp0RrKwvdIO9e?= =?us-ascii?Q?mer9YGMDbEh/ioODyipNN1RMIRU866VDYjv8O2X/+sCqQu0C09+mZ+9ZZZB4?= =?us-ascii?Q?1r2UWr2Y2TPy2/yH6AsBOQK2WAYd05uDoNHBuf6c/yI+f8ml1t8oq9mKeDKY?= =?us-ascii?Q?mOP3DjKxWO1sX+5xAcIHf45aNxSdTEMtbsEeSWi6TJjuJegoIQhroyu6iRos?= =?us-ascii?Q?ktz3hG46LFEnFEs5ov0hoOIjNYp06WSV4DMAuSRbIotm2qXxudXdpGNUTJb3?= =?us-ascii?Q?8mzcFSe8wdAf2CpkhTszzf/XBixXa/sq8Z9A0YNpkRif7tlr/cW+e1LFZ8ip?= =?us-ascii?Q?JjSjw6r2VsdBMlrfaIYmOERRLSOtTKuG7DYkOppjW/RPakpRAxN3s2QxX1Wq?= =?us-ascii?Q?9BZVGueKMD/0=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1837; 6:CR3d68P+zF6q1PnKTvxFwgwCEaWjA1j7m14J9ujsQVXqYOSlFfzAFnp3Qv6/Q48Q08pMsta8UIUbxPfJCTwrRMqTJkPUxEDY+78w0i0e/CUOJX0GabY7qNIw3/qeLrlkAJ3p8WBAsOorAL69DDYxf1sV5xCJ+vF38dZYdLZomq8cWG+vmbj1TqU4for0HOa4k0FbtTfmk2CMcthSPp5ts3lgOmbRVnoGaCBxcgZju02joUqJVReTwo32PpQTs++bXoGAAGrp4PZ2ovtXViNVpSxUMuA/DzfpAAXWwfHKfVAHSL94RuSVoJ0oD56G047FXb1M4BArJmGfLjcWhKZvUCO/hHEGmGLvDFUfEI8zcFE=; 5:1eZ68ikYnNuKyCmfO15CWpiOm45j2qHpXuytHG1ujkfVtUucy0NS0fQz79YndeN9iguljusMY8JhdC27LrV6Vx6RWg7+ttN3fefBcbNP7SCCD4+6avRlh353DcMJLeoulgG7Uw3zVz1N3OcQOmld7vuyScTXqg7glcGx832hHwQ=; 24:2RECTMc449amf5erVNHWZGEbsx4AVz/I65lBdpmIKl1ewY7BdVpEJCaqbSDW2ZyFXneq1CaILD2BU8NkYTSHFdWjTE53CiV1qKCBPJRwbZ0=; 7:YV/y3Gq3reynBj/sztt9wgJcHZMpfNwq/8Zn8dtVcnFx8uqAzQhGbfEFm8L+p4GIb6KeHICW8fdeWh3RUgRn0sQ3LKP50HmS/ilh1/7XMCBCu3bLIzb4zPWb1pWT+braHG/CYvUSHS1nF8+sCxaegOAzd4scvkiYzQt8BV0I8b/DxjvyJEhmKUL1KFwjWDCas1dP/nMNlw1YynVlN4POAexBP2vRp9iQE9VdOISwhMG0KlNkNP2O92JPp7dMmFmO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2017 17:34:41.0921 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5a4b368-1122-4e10-997d-08d548991e0d X-MS-Exchange-CrossTenant-Id: f267a5c8-86d8-4cc9-af71-1fd2c67c8fad X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f267a5c8-86d8-4cc9-af71-1fd2c67c8fad; Ip=[208.19.100.21]; Helo=[avsrvexchhts1.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0201MB1837 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 Remove unused rescan variable. Signed-off-by: Raghava Aditya Renukunta --- drivers/scsi/aacraid/aachba.c | 19 +++++++++---------- drivers/scsi/aacraid/aacraid.h | 6 +++--- drivers/scsi/aacraid/commsup.c | 14 +++++++------- drivers/scsi/aacraid/linit.c | 4 ++-- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index eef7322..aabbefd 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1822,12 +1822,11 @@ static inline void aac_free_safw_ciss_luns(struct aac_dev *dev) /** * aac_get_safw_ciss_luns() Process topology change * @dev: aac_dev structure - * @rescan Indicates rescan * * Execute a CISS REPORT PHYS LUNS and process the results into * the current hba_map. */ -static int aac_get_safw_ciss_luns(struct aac_dev *dev, int rescan) +static int aac_get_safw_ciss_luns(struct aac_dev *dev) { int rcode = -ENOMEM; int datasize; @@ -1940,7 +1939,7 @@ static inline void aac_free_safw_all_identify_resp(struct aac_dev *dev, } } -static int aac_get_safw_attr_all_targets(struct aac_dev *dev, int rescan) +static int aac_get_safw_attr_all_targets(struct aac_dev *dev) { int i; int rcode = 0; @@ -1983,7 +1982,7 @@ static int aac_get_safw_attr_all_targets(struct aac_dev *dev, int rescan) * * Update our hba map with the information gathered from the FW */ -static void aac_set_safw_attr_all_targets(struct aac_dev *dev, int rescan) +static void aac_set_safw_attr_all_targets(struct aac_dev *dev) { /* ok and extended reporting */ u32 lun_count, nexus; @@ -2029,7 +2028,7 @@ static void aac_set_safw_attr_all_targets(struct aac_dev *dev, int rescan) } } -static int aac_setup_safw_targets(struct aac_dev *dev, int rescan) +static int aac_setup_safw_targets(struct aac_dev *dev) { int rcode = 0; @@ -2037,15 +2036,15 @@ static int aac_setup_safw_targets(struct aac_dev *dev, int rescan) if (unlikely(rcode < 0)) goto out; - rcode = aac_get_safw_ciss_luns(dev, rescan); + rcode = aac_get_safw_ciss_luns(dev); if (unlikely(rcode < 0)) goto out; - rcode = aac_get_safw_attr_all_targets(dev, rescan); + rcode = aac_get_safw_attr_all_targets(dev); if (unlikely(rcode < 0)) goto free_ciss_luns; - aac_set_safw_attr_all_targets(dev, rescan); + aac_set_safw_attr_all_targets(dev); aac_free_safw_all_identify_resp(dev, -1); free_ciss_luns: @@ -2054,9 +2053,9 @@ static int aac_setup_safw_targets(struct aac_dev *dev, int rescan) return rcode; } -int aac_setup_safw_adapter(struct aac_dev *dev, int rescan) +int aac_setup_safw_adapter(struct aac_dev *dev) { - return aac_setup_safw_targets(dev, rescan); + return aac_setup_safw_targets(dev); } int aac_get_adapter_info(struct aac_dev* dev) diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 9b678f7..9804d3c 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -2644,7 +2644,7 @@ static inline int aac_adapter_check_health(struct aac_dev *dev) } -int aac_scan_host(struct aac_dev *dev, int rescan); +int aac_scan_host(struct aac_dev *dev); static inline void aac_schedule_safw_scan_worker(struct aac_dev *dev) { @@ -2659,7 +2659,7 @@ static inline void aac_safw_rescan_worker(struct work_struct *work) wait_event(dev->scsi_host_ptr->host_wait, !scsi_host_in_recovery(dev->scsi_host_ptr)); - aac_scan_host(dev, AAC_RESCAN); + aac_scan_host(dev); } static inline void aac_cancel_safw_rescan_worker(struct aac_dev *dev) @@ -2677,7 +2677,7 @@ static inline void aac_cancel_safw_rescan_worker(struct aac_dev *dev) void aac_safw_rescan_worker(struct work_struct *work); int aac_acquire_irq(struct aac_dev *dev); void aac_free_irq(struct aac_dev *dev); -int aac_setup_safw_adapter(struct aac_dev *dev, int rescan); +int aac_setup_safw_adapter(struct aac_dev *dev); const char *aac_driverinfo(struct Scsi_Host *); void aac_fib_vector_assign(struct aac_dev *dev); struct fib *aac_fib_alloc(struct aac_dev *dev); diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 6f5dfc9..019558f 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -1948,7 +1948,7 @@ static int aac_is_safw_device_exposed(struct aac_dev *dev, int bus, int target) return is_exposed; } -static int aac_update_safw_host_devices(struct aac_dev *dev, int rescan) +static int aac_update_safw_host_devices(struct aac_dev *dev) { int i; int bus; @@ -1956,7 +1956,7 @@ static int aac_update_safw_host_devices(struct aac_dev *dev, int rescan) int is_exposed = 0; int rcode = 0; - rcode = aac_setup_safw_adapter(dev, rescan); + rcode = aac_setup_safw_adapter(dev); if (unlikely(rcode < 0)) { goto out; } @@ -1978,24 +1978,24 @@ static int aac_update_safw_host_devices(struct aac_dev *dev, int rescan) return rcode; } -static int aac_scan_safw_host(struct aac_dev *dev, int rescan) +static int aac_scan_safw_host(struct aac_dev *dev) { int rcode = 0; - rcode = aac_update_safw_host_devices(dev, rescan); + rcode = aac_update_safw_host_devices(dev); if (rcode) aac_schedule_safw_scan_worker(dev); return rcode; } -int aac_scan_host(struct aac_dev *dev, int rescan) +int aac_scan_host(struct aac_dev *dev) { int rcode = 0; mutex_lock(&dev->scan_mutex); if (dev->sa_firmware) - rcode = aac_scan_safw_host(dev, rescan); + rcode = aac_scan_safw_host(dev); else scsi_scan_host(dev->scsi_host_ptr); mutex_unlock(&dev->scan_mutex); @@ -2036,7 +2036,7 @@ static void aac_handle_sa_aif(struct aac_dev *dev, struct fib *fibptr) case SA_AIF_LDEV_CHANGE: case SA_AIF_BPCFG_CHANGE: - aac_scan_host(dev, AAC_RESCAN); + aac_scan_host(dev); break; diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index d39dc5e..8aa818b 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -1790,7 +1790,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) if (error) goto out_deinit; - aac_scan_host(aac, AAC_INIT); + aac_scan_host(aac); pci_enable_pcie_error_reporting(pdev); pci_save_state(pdev); @@ -2077,7 +2077,7 @@ static void aac_pci_resume(struct pci_dev *pdev) if (sdev->sdev_state == SDEV_OFFLINE) sdev->sdev_state = SDEV_RUNNING; scsi_unblock_requests(aac->scsi_host_ptr); - aac_scan_host(aac, AAC_RESCAN); + aac_scan_host(aac); pci_save_state(pdev); dev_err(&pdev->dev, "aacraid: PCI error - resume\n");