From patchwork Wed Dec 27 04:34:49 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: 10133419 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 133176037D for ; Wed, 27 Dec 2017 04:35:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE1BE2BEE3 for ; Wed, 27 Dec 2017 04:35:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E26D62BF16; Wed, 27 Dec 2017 04:35:39 +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 3063E2BEE3 for ; Wed, 27 Dec 2017 04:35:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751870AbdL0Eff (ORCPT ); Tue, 26 Dec 2017 23:35:35 -0500 Received: from mail-by2nam01on0044.outbound.protection.outlook.com ([104.47.34.44]:54464 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751642AbdL0Ef1 (ORCPT ); Tue, 26 Dec 2017 23:35:27 -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=tKXs0V0DASA8dYrhieOUVrHNaypAm/6r5p7sy8VAyMY=; b=TiPG/6t89LlwW0e4fd0+bwVZZzZVIPXbGZqQbm0HKykQdivcllltHF0u3FRK1gdnJY5KACNhATclwRKwBj87EmEq53eapJohlVtLugGLsDZZT8dJyqeeLCsEysc0RT2BymVV7H36wKEPh3Wnh7rT53Dmrq8kgjE3ioyFxeAf4po= Received: from MWHPR0201CA0048.namprd02.prod.outlook.com (2603:10b6:301:73::25) by BN1PR02MB134.namprd02.prod.outlook.com (2a01:111:e400:20::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.345.14; Wed, 27 Dec 2017 04:35:24 +0000 Received: from BL2FFO11FD050.protection.gbl (2a01:111:f400:7c09::151) by MWHPR0201CA0048.outlook.office365.com (2603:10b6:301:73::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.366.8 via Frontend Transport; Wed, 27 Dec 2017 04:35:23 +0000 Authentication-Results: spf=pass (sender IP is 208.19.100.21) smtp.mailfrom=microsemi.com; wdc.com; dkim=none (message not signed) header.d=none;wdc.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 BL2FFO11FD050.mail.protection.outlook.com (10.173.161.212) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.345.12 via Frontend Transport; Wed, 27 Dec 2017 04:35:03 +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; Tue, 26 Dec 2017 20:35:02 -0800 From: Raghava Aditya Renukunta To: , , CC: , , , "Guilherme G . Piccoli" , Bart Van Assche Subject: [PATCH v2 28/30] scsi: aacraid: Remove unused rescan variable Date: Tue, 26 Dec 2017 20:34:49 -0800 Message-ID: <20171227043451.27813-29-RaghavaAditya.Renukunta@microsemi.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20171227043451.27813-1-RaghavaAditya.Renukunta@microsemi.com> References: <20171227043451.27813-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)(396003)(346002)(39860400002)(39380400002)(2980300002)(438002)(189003)(199004)(6666003)(478600001)(69596002)(1076002)(76506005)(16586007)(51416003)(48376002)(76176011)(106466001)(305945005)(50466002)(356003)(316002)(72206003)(77096006)(8936002)(106002)(50226002)(57986006)(5660300001)(104016004)(36756003)(110136005)(47776003)(4326008)(54906003)(2201001)(86362001)(59450400001)(2906002)(575784001)(97736004)(68736007)(2950100002)(81156014)(81166006)(8676002)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR02MB134; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD050; 1:+nlb19UMl81ykt1XaK1v/q4KpZX6rp9fHCJvJ5g9zVGPElHDRAaMlhpq2xAapikQb3TSfh8Y+C5+Ex4noosbUbM+ECjcIemP23lG6gesD5ydh7KAgEftnYH3Mejblp5E X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 459e6994-2ed6-40c5-da98-08d54ce3330f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:BN1PR02MB134; X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB134; 3:HipPcr0DBZ3ZKu0AXP4RvtXvKlu6L0cNQnpvJyHh2Y5i+C7eHtsKKD7TMwgZTCBinJdhxvJgaTYVWaHf8yHP+cpABbLES/cMTjDdD/m51Q5GighVWukNr3/cnrFNzMrj78K8QWQAjvW4CVuvdPDfw2QeqYmJPojWuNeEDr/rb75TqPHUTT8PiI7lmH+M0XRWEjX3unqXOakF9LOIFaMVHsUcSkNdGpXfr//XDo9B/XRA9cE7AEpiFTeRSE5NLGodT7XfIUxWHGC1ltpz3F4YIBTs0SUaowe2FrorhPP3A116qWLJ5Jh3nev+MVEu+hPNhAxgPAIi9jLadrHZ3+RyhUn8wOhI7G1e8KDSi1VAbZk=; 25:6W2LB50TAluHDcquKJUKgSVJM7JB0d4GhD6COB9Dm35S/yMCGy878++6ghivrRUfxCVYj208TdiGm+toxPRGEuknIyOkg1FwfGjtWAPfr4KSt5raL/qDouDHnb1KOSvqlJ4DlNbnY87S2aNZhnihcCIaTeeRHkRP+C3qBm75AGfOU+aP0OLSxNAY54iLyOqwDZunLcV5LQN0x0zEFG3xxaBNKcR1sulNU/nMWHfNHiX0X7fBMj9DUQypZyqsjJNXxWow/ntDk6OLEdoAwBjJVQ6AX8+r+apinSa4ZXZSnpjTQ2KaceACxR7DxAb8aMDYOHgX0LkIxBR4AD6wCD2IUrnjIMLoudpqBSkNu3sVuf0= X-MS-TrafficTypeDiagnostic: BN1PR02MB134: X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB134; 31:FdgAy2agwHP132AmDcrgcyimJXDVzWBlslacduMRgJRLw9pGzLvKFIx2qZmrDbhsTyyZMBvp6G5HD6G7ft2BrLu0cSkciBQv+qTnUJKf9bULbFXBbqE0xCBy9mrAbGVjGPwz8W2p1ToTfNOpHOgvkEPz7XIfPmtlFqkeYow7wSs8Dbj3tz/0CHlh5ZuM5wYFbkS7pRiDbsDVahw/vdFdkIs3BGryhxHzPO5Moi2dcXY=; 20:bVDlvkWcYRd8tZPgMwMWO9pOf2coGaGpRt3VSo6HVuwSzy/4DwGQXG9G22uFbXArS93ovF07hYtSGiX8IFlFI1FEl5X1UKTGtfQR8T1vjHjfR9b6p33AIBWQwvU2UtGuceDk2KprUCFsTYZFH9e/UmXIDRDoqRPa1syxpLXkKNbnYDZUMuArqJKGl7bvrsNXlQyEcWvX0Gre/9Atbq8bWAcxiEE98r3p2Hk9U7GsaURLP+O6qytwuZ/CsMF5K1x3DS+Xx84MGwPBRgxS9EKXb8cs8/yGjmAhn2T8b3RnUQF1OS6B8e+4BSu4WSMZm6O/Uka3nkT6dOsKuI6lAaRpcHd0+jT9iXyWlE5UqiQ7pJJZEvPyqbx0GBkUmq1Yk9p2CMAnpy9zPZi+cWeDr0GDEzZxlJg1y6FC3q7q6ozMNv+zN+D30GUavDF0rkwoveTqkX7EC34ScKsBWc7LWq5QU4PBx6bpxJj2Imp8xLeaahTgLmH56QMPlA7S5h2RLlQeEXtJU0YFf10MZZ47LgL8BweyafKXV27pEFBW9swGtWKrG/hW7tKb2LN8ja6+JdhCs9PRt5xjQJtPcEpZtO9yduQIvyaHPFdrqnIEhwulMGg= 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)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93004095)(3231023)(944501075)(6055026)(6041268)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:BN1PR02MB134; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BN1PR02MB134; X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB134; 4:0jTRyJiRvzIVg9erHSKqYo3F5NyLf42EGsA0515FXHzEQVWQWPpP35wPU2hDgLTnPfAObYodi1tZYXGJ/H3a91UHntinQ2jDQIAn7VmIYSvTybAcsOnH03OYgPbZDqdNONngnYvJDemjzCS/f/aewNuzr1s0WE1F3DpI0fFEORW7fb7Trm6jNmTAAsTGfFS3yAtOXudE/A6ef/Ol7nmrhEM84ULjJDgB2AsY1B3liONTJ0fTV/ecvZPQweUtYCyPRHARoPoYVDP7X5kjrpKESD5nZWvBsaVHTc0CXjfeoysas3AdEJsod5IVvKmSnkXiSrS3WibTsPkHiU8lTYnDYqdHGxytoD7ayJxz1sunAQ0= X-Forefront-PRVS: 0534947130 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR02MB134; 23:lq1cI3233Hdu76HoaLVBYWXJtWLUMor853i9z/Hg+T?= =?us-ascii?Q?SKZyO8cSpPGseDVlNVY8KhMWdoORzWSFD7F99vtKWRhFPuwqOJg6WvkyRzej?= =?us-ascii?Q?ik6wS/wqfdM6emW+QZPvX6Sebwc5QxqwBe6xkXbJxThgtPsJxlVpzV8l2WcG?= =?us-ascii?Q?uncOZfmyrt/T63G7lYoiDQ/4YGuFLrSo3S0HvUz3sSYsJduBvzK3Tfm3v3i6?= =?us-ascii?Q?4zM6P3D5G911RQi2SD8vl9k0SB0coyy19EeUrLHGcneDDUyOD/Vy4/Rtp9N0?= =?us-ascii?Q?oiQTF3OaIKSx2ojM+Xai+B0XR4EOLnZ+RRC3PiaPBRZw9fO1mgdvA/MYNhsi?= =?us-ascii?Q?vcHxb/sbIIgwuFzJx2J46UHnx5Eh0+PySCqXfDz47BP8CF8HvjkKfgurivUn?= =?us-ascii?Q?Dj0YCkjynnVMHboTz41OXygUolCAVkffsMeyv50PnB6MQTF3HWK6I/GPCWup?= =?us-ascii?Q?Z0Ctdz11PzTiwc5K1xzpYH8SaKlPhJBXik9R5VsRr8lxCzHsZ0BWIQO9f8Au?= =?us-ascii?Q?VHS3wo3Ut8CGLLCSuDS62yWYR16S77X6F3cd9rth05C60vr3ATZ1PQU5x4p6?= =?us-ascii?Q?BlFUoVWU1bpDZ6TSyY+5NiobOXb4aEZFlpSnIyfgztklKjK2KziacadXaatp?= =?us-ascii?Q?9o2X14rmTf3QIqWN5mSlKC7ueO4s3VDUk4RvBQtYSGcIAjn2O0JM43vlAURx?= =?us-ascii?Q?Y/1kEWbsp4Jof0Rrzq0DqLgCuWP1ask0rDgNROUhhitJvTJbBNqq2v7vi9Qn?= =?us-ascii?Q?0MbefSw4TlxhwtreBFs0coPP5ma4Aup08dNzr8Aenj1NbFCBNTCPCKvHz9t+?= =?us-ascii?Q?ZWcZbDXhhwcK8pX5BBEdFDz+xT1pT3a6AahgsFrCSkAvBPKZN7h6p+zu4mhF?= =?us-ascii?Q?kqz6uvgoR4BrjF6SSBdvfOkFrPFKvqcv96sJ7DA6qxiaa6NzoSnJFDaigOsw?= =?us-ascii?Q?T+zHfbHE64n9P+ousjN0A5ibUFmnxojiuh884Z0hX+Vbv0rhWJ76jIDFOiX6?= =?us-ascii?Q?fEI4kAXWkul/eHEw2QSqPp0TcGB3WrDMHEV1uqrH2Z/MQ8OQrYmXW6iSpUnT?= =?us-ascii?Q?Qr+zGIGQsZf7g2UkORxd7d0+7V6X+SbJWLvW7/MUmfT4sDps0MW8CNYHbatF?= =?us-ascii?Q?s4Bdzzm4qNX/1FqFN/praEYWf6yMdp?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB134; 6:kb1rh2ubiOZM+qeXOvPrOiUAp52H8XgdpyyyyKwG7uAB18Znf7iDfLinOUTxj4986Wyzyhj6FedbeFAfJXHcibrxeh/3y7jHwf5maXlwbOPUYMTnQnqOZuXbiEB1d65U/KQYn1s0dCHuJR4P15t5uunqloPyuatvmZt0Qpvom4zXv8qvosrl6OgDxQF4Fp3RzVUDWLvPUjQuH+BUY9aU30PBkWfZezxqCBTd4KESzG/cWmd8W4gwaMM3ArXS04QtPsm+ZerH8dRcu1Bb3a9N8LAHjrCq5tCPCOG9OLFc2X60WAGn+HETPtn2QrrvkPf7YeKCu+x8AdN6tRpL54MR0fVvo/mXnEhKoFoJRU7zFR0=; 5:NEHadl4XMvOalNrOpy3gP9awETrkmsjnx+6REAgaDFQ7FM1nTNTDNag+g226e9F7CNQJmoNvpp9iEOd+yOo0PnfQE/lVOclVEKOYOhP0WyV3ddz5GAYReeeOw/CQqEyq66N0eYFbVRF1hzq6YKt5BN4hSmW44ZKvtLu4Br+V8q8=; 24:m5nmIO/koOxiGHnjdJ7pCPREGsDql3mbzZ3h2sS8+l4/2uc0FsWdFonhX6kpjTrzhfIFGVJmxlhnHOUTm5GYfu5erxfoT4HKqTUT+aMSLu0=; 7:i9hQ3Pv6NjeIpLeifRREJd/bwUsKSfWBFnT1vc/wd2Dypy7KscX0piQrXdHNLICr+vCZlVhm8vebkTmTGrWjhhbV397yUsXNVm92JTIdBB9f5MJvrwVSVYoinD6O338wTLu/XkDWvC0t9H64oVf5XrRdF1Wu15OjqEAzDEQiAp/PiHztoyGuhS/NGBaODDdHF7/UuzrgJ6OeT7d6DvdpFqSBENSwvf/qIfUI2mfMXHxmhm5cmvBZMUJ/eOqEwa7T SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2017 04:35:03.7481 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 459e6994-2ed6-40c5-da98-08d54ce3330f 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: BN1PR02MB134 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 --- Changes in V2: None 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 426c61a..f498bed 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1821,12 +1821,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; @@ -1932,7 +1931,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; @@ -1972,7 +1971,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; @@ -2018,7 +2017,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; @@ -2026,15 +2025,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: @@ -2043,9 +2042,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 4cefc47..3e8a44c 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 f0c3e7d..fbf8b7e 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -1944,7 +1944,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; @@ -1952,7 +1952,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; } @@ -1974,24 +1974,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); @@ -2032,7 +2032,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 bf9d2b7..ad6ec57 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");