From patchwork Wed Dec 27 04:34:32 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: 10133397 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 82ECF602BD for ; Wed, 27 Dec 2017 04:35:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B41C2D864 for ; Wed, 27 Dec 2017 04:35:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 601F32DA56; Wed, 27 Dec 2017 04:35:17 +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 CF5A12DA5E for ; Wed, 27 Dec 2017 04:35:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829AbdL0EfQ (ORCPT ); Tue, 26 Dec 2017 23:35:16 -0500 Received: from mail-bn3nam01on0051.outbound.protection.outlook.com ([104.47.33.51]:63168 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751807AbdL0EfL (ORCPT ); Tue, 26 Dec 2017 23:35:11 -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=3rP9GtLdRc12Dcx9VB4yo78KL1cCUo0vct5bMbYEAjE=; b=EWJVG71E94BiL62qTijM02FviV6oRQ/6MSNQcYFWwutzAGzSBJnEfOrbH0Oap1jkDY3HVErqAsZJ/AlWrwMJyqlYfBxENHXxGieei4hbswj8dhwPslMA8MUItU3ZP1wuZerATQhpHClVYIfNVamN4R89za9Y25Clb+C7ATdJbKE= Received: from CY4PR02CA0006.namprd02.prod.outlook.com (10.169.188.16) by CY1PR0201MB1833.namprd02.prod.outlook.com (10.163.55.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Wed, 27 Dec 2017 04:35:08 +0000 Received: from BL2FFO11FD049.protection.gbl (2a01:111:f400:7c09::140) by CY4PR02CA0006.outlook.office365.com (2603:10b6:903:18::16) 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:08 +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 BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) 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:34:49 +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:34:56 -0800 From: Raghava Aditya Renukunta To: , , CC: , , , "Guilherme G . Piccoli" , Bart Van Assche Subject: [PATCH v2 11/30] scsi: aacraid: Refactor and rename to make mirror existing changes Date: Tue, 26 Dec 2017 20:34:32 -0800 Message-ID: <20171227043451.27813-12-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)(346002)(39380400002)(396003)(39860400002)(2980300002)(438002)(189003)(199004)(57986006)(106466001)(16586007)(478600001)(316002)(72206003)(6666003)(2950100002)(53936002)(110136005)(54906003)(76506005)(106002)(69596002)(8676002)(81156014)(356003)(36756003)(77096006)(4326008)(47776003)(8936002)(1076002)(81166006)(5660300001)(68736007)(305945005)(50226002)(76176011)(51416003)(48376002)(59450400001)(97736004)(2906002)(86362001)(575784001)(2201001)(104016004)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1833; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD049; 1:GfUkqvRHTGXFEqGcSLaJuVLkIvVoBtc8kx58EO9Fl3qQEdU7PjPKawNFLGJXTQ9+MBYGTJVzTd5cb7HfN893KtafqXHeg1lz0yBSBcHGeZAOqA0Ok7itxM2y8dyzmvWx X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8771145-9bdc-4ff1-26eb-08d54ce32a4a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:CY1PR0201MB1833; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1833; 3:eX4tNUNaVf/Q8tLZXBe3zxme6daBnXJNHW/8NDeDp580xgv5BryjBnLm42rDjei6UEKZkfcaWQwiEsZASihgh14JPzkzN7K6ttulZv82ybhZmFBuC2SniJI5xzBh39CVwP0tZWrH6h80ryeL4blARVHf32DHLWeirRBUwvdbyu1IiVrX6lRyVn9ziDOOnW84SQoWmI3gdKe6hXM9H3iSLGAOMyAekSpLn2gE4Qzd8+1IcgO3OddIBLL6OuDol8ZHzOFjjzwq1QOaGbwMlFGHz+eTfBirU4Jx1neVRyQd14Et1A/w0ctAFHIMgjTJT/agcol5tDTB0t7ic7Njj0J9JcIV0D+T4Ims7yGYJnbpZ98=; 25:UtqtBXVZqyDUKtGCHBqnFQHvSQ1vmGV0udq28AdzeKjZOC7tbQI2vT6u2dPZ+yRY7Wmumh3Dp6vpZkizxBP9Eq2P934MzApay/yIJnvG9kB5Dp+f9HWrKqf0AwdJ4rrm3kpKC+Vm5UMyPxVYC2Dgv/9TrSQJRbRe7dBemO7jvHdJYGVZSxMHGfkc5uNkYyI3slk9QpU0VtYRebgv+DayEkz0juLlPcxIVgwF7Kxswl5MNDCztuN4NoqZuTTzJTAt0Cn77qNOPunXukpEMHgXEyZZTEnwDUHnxxxoeuVY93GxDr4/pQs1PSOv+B3xZN/S3A6WE2wfCVzM/xUIcgY1fQ== X-MS-TrafficTypeDiagnostic: CY1PR0201MB1833: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1833; 31:LH8+/HjZO8AZc+df8FB/mSEY68T1QnJ3smkPqPlHgUJSBVmOyPJ+/hidmx8FkX3A+zVMfA1qXVGhecIyxK7yCZI9yYHGaZSup0pstVxTsSPs1GJ53y5Y7L5Hb+nbRVh5gPa+5EJ+nnm/Gwef/qfPs+zSkPq38AgbCrV0Krd8SVWr+KdMp+RJF7dGXvwIM/AOPX79NWTppIO+LMMt9hoojvtIjkzNqqOpvdw0KiryXJc=; 20:p5l+byIPnE/Jwp+LG1jfva4rC0IAfe92xqdX/ino1HiMZ3dT31CyAJ3/G6qvF3SMGy9U+QICfjd2IGR/Dj5zmwm/N3m9KAao0bbN9/85eapq9XR4euZd7kkMNdL0NlbSNsG+1wy80faiTtvtefgAwuiXTPboRykvvYDlM3sEP7bxYOfc4nmH4x68B0855cfaEnjpKl2ru+zvSGgogmV3i3HZdnbSPK9ccw3XRH3NTIHdWfK7RTpLPJZE393/8W63DrBd2QlgRXigeoAGZKAg3xoqE71AUfgiJEbx5J+Gg3e9l2TxDRTLDV9zIny9QEQb1VBd6C4Vl6eFcetmGT1hEa8I1f1AfA4evlbHbnmaJ6ITPRLqhEs93OD37Z6q3snd51gVKxF9T7cFNvN6CiFvqAve8sqdCrcNk91LsyLMxp73s2kvRi0w6xuBUaZ1YoSKDxOUhtJsWT3NLLKJtQ4z+zNeLUwdqQw7KJugOiLNizNcRnMOwvIuHNlRk8J6Ve5h5Ww3mg2cGmQHfQ3wdzpAjQH6qnRZM5Kw7Cs/v68iMlUWaLmkRI3dDCQBGD/d5rDocCYhKRn7aCDXusoDrb+ArEAau9/+UTmj+D0dMLZHtWM= 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)(93006095)(93004095)(3231023)(944501075)(3002001)(10201501046)(6055026)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:CY1PR0201MB1833; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY1PR0201MB1833; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1833; 4:SFVRbNHk6zi/emQVVyfyVohDCsnPKNdY38q1IS2q1Erv7plkbpe7KmZtGkQ3ZOtuG2A4Y3XmaUBwCUKcEp/wTKkW8NVm9xOi3NmImaVCA1GtbOvz5Q31bwQkcDpU7JYM7dMmPOKxGI9YsBqBCg9bV05zDXKbpXEatIrJuJbhPP231zc7CG51r8v4ksgbxg8IsMUjHKKRfj4jGZ9nU3uvLlPFpKsRr0xBqf7ZolI9FPRLsDoj44Qijdi788mzlReTiYFR6INBfRMPTsnjTxRGVlCS0ESfvO7+/NpY2nlGp62DyiuTte23ZP6vQ4uW8ciMyfMR+t4lhTB0fjE0CAubrSZynA4TJk953mKRgG5ViIw= X-Forefront-PRVS: 0534947130 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0201MB1833; 23:NWKfvx8i5hZyco/T/jJW5N2B/gcAs98sIi9RYB5?= =?us-ascii?Q?F90CgOp+ica52s2S+9GE8BtqYC/4CgcaCZjCSdKRs5eGwdFbv8QG/1vvMRV4?= =?us-ascii?Q?3iSiHzmMZ3ltesdfdU2Lmo+pwhibyt0tF8+NOTFGvHd5BIAGKyt2XJqtlw4r?= =?us-ascii?Q?eflvM7zecBdJYIkf0icttqu2zF76ASi/Z0VtV+HWNKDliIx9jGEw2oUAInbd?= =?us-ascii?Q?o4GTCZBldRTI5LQ1L8drGlKVOlbUSMJSu2pqsT2KqVko5E9a+NhDJUBEP5nO?= =?us-ascii?Q?JK4/VXGSvo4Kgkbsxm5bjv3ihHPTGHQOQWD05/NR09l21Wb5O0CKzbgeAJ/+?= =?us-ascii?Q?lKXkzUrZxUEBGiJfDNgOQb4Ma3KH8TPl+IDW8L5A3Gga5MZ9uMpap3OK3prc?= =?us-ascii?Q?R+jfc6jHTwFBehQ9mis4kCntWvsbfGey2l1pYQHbEzkM3LK/BvE+/HbgDEZx?= =?us-ascii?Q?EkS0RdVrTjfQO8IOhhI2cCeWNMdebvavRGpen4NURADPW22KcDJtfN2kT4u2?= =?us-ascii?Q?QmyLABLNnWovdK2a0WAwrpiUjpm0w1zRsXCIaHzTnQq41K9pCSr02SOb8Xkt?= =?us-ascii?Q?qVFWNiNqXwnDHSsHO+n/40pZeip6LlBLIdp+DBGY9h63ZCToq/6aErSmf+e9?= =?us-ascii?Q?/55Dpbf0MHffGeNIqoQHb/SEu1a0fXnIyqqI6VqMtLQ4t2uB60hZqjTYccnX?= =?us-ascii?Q?eZ/OvvSqamVXO1U43e3LPfpEsHsY04klUGMVaDUh4znzw2n/s+A/8Yhtk+Ak?= =?us-ascii?Q?03aT2ygTe+HTWYrhtA8SrFS4PTAPy1dDbEHnbT9TvhpchDSNuPk9QrWjda5q?= =?us-ascii?Q?uMRzlVn4NVVIi2A5JrSQ9nz7mjY1dH5KpoOlbHLVy1hbinOqZbBZ5GIyQj5u?= =?us-ascii?Q?LDIVP4ZWRxfWffZi23AX6+kW/IKW7CZKIZynqzzIwTlw21XjnBSQyZAHoYvc?= =?us-ascii?Q?w+YA27D54ygETTrmYwnu8MQUR2c/3umDGL3st2JuJfdr6WiJecgRCiMZqxX9?= =?us-ascii?Q?c0hyMy2lh4FjBUklvuVhN7JLVNNRHjAK4J9DxvIgwozs+KmGLe7h9kFXBKNc?= =?us-ascii?Q?E1zykiKxPvn60HGrP2ZHZ9lSxOrLzFH9QWF/QvJvC1vJZoWL2ObnZOmVovo8?= =?us-ascii?Q?AfSE2xBn/MPRH9iFaGq/IgqQ9E524SDz7?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1833; 6:KqKuQ3xBYwBrrKCRPClSnjIr3nGBal+2Z1ssTi2YnCuOs61tbzycocqL2pY5q80wu6QXVoOt0A1Sxma4eaqdfSG1Dznwti9ddxlqKd63rq33zV7uqXg5LGMIwo89guAiD80rVxUwEjPClX74RIghHPMkT1h7hctTF3zxvgx/uBUvoa/8StVaB2I0Ox87fgpq/uiJQEnIpG/AF9h9p1KBf7byKUq4w4qRMF1W+ROBe88UcZGvigZM/e1JhRa/X5EB0Jzufc146S6+O2t3Xp4pZ/wkdof6jXFXjiqh9NqG2nolHloG6igSgm+2VsIOkoQuENbuA4g5ofpPI/BjaNSgVvyJjrVWcFwf9AS3HN45kek=; 5:RFuo0OnADKo/HrJrcruMOk90RijaZGw4d6gDViT4y1o5U0ztYHGMNCpmKCSlMOAZfDJ3p462MxznBfO7KfLCoDUz8iAfZjX7dvaqLMShTxvFMsxZ+5AqFYGJ84zC3O2/ZUrjD2PB9YTRUGGrccFCZzMerU5qQdRQZwZDmvIzCyA=; 24:Wxlv/tTRHDKfCpg9RZj3dfg0kfU7Of16aGHUn3iWmivx8X9JV6Oy5CyXuZGmFR+67ueXw5KJLTuH96nmYpXOfAtf4mkhbElQukkfgbTFnpI=; 7:PiHEIVwVUbbetrDbmc81+myne9mLhrTyNmOs6/GCxO68sfamqkRpQLaEBfr7h/bL83x5uFfyzDP3c2FzV1IXu2JwHJ6zY9d971jVL0r2duxQckFPbYAVRV/2oRQmBZ4eZezhmt7OsTCoCpmIv27v1fO/BHyl0KwczCyXJFJJ9o2KscSEFVk2sXN1mlzWe2pfgc3OcvExST2PMmLvnqtGgjvND83ck2UMfO+rOsJECGEFjxtbD2EBxHSCcHd1GzAu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2017 04:34:49.0307 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b8771145-9bdc-4ff1-26eb-08d54ce32a4a 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: CY1PR0201MB1833 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 Rename variables and functions to make bmic identify, report phy luns to make them consistent across code internal existing code bases Signed-off-by: Raghava Aditya Renukunta --- Changes in V2: None drivers/scsi/aacraid/aachba.c | 36 +++++++++++++++++++----------------- drivers/scsi/aacraid/aacraid.h | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index 1853bd2..801aff0 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1753,17 +1753,18 @@ static int aac_send_safw_bmic_cmd(struct aac_dev *dev, return rcode; } -static int aac_issue_bmic_identify(struct aac_dev *dev, u32 bus, u32 target) +static int aac_issue_safw_bmic_identify(struct aac_dev *dev, + u32 bus, u32 target) { int rcode = -ENOMEM; - u16 datasize; + int datasize; struct aac_srb_unit srbu; struct aac_srb *srbcmd; - struct aac_ciss_identify_pd *identify_resp; + struct aac_ciss_identify_pd *identify_reply; datasize = sizeof(struct aac_ciss_identify_pd); - identify_resp = kmalloc(datasize, GFP_KERNEL); - if (!identify_resp) + identify_reply = kmalloc(datasize, GFP_KERNEL); + if (!identify_reply) goto out; memset(&srbu, 0, sizeof(struct aac_srb_unit)); @@ -1774,30 +1775,31 @@ static int aac_issue_bmic_identify(struct aac_dev *dev, u32 bus, u32 target) srbcmd->cdb[2] = (u8)((AAC_MAX_LUN + target) & 0x00FF); srbcmd->cdb[6] = CISS_IDENTIFY_PHYSICAL_DEVICE; - rcode = aac_send_safw_bmic_cmd(dev, &srbu, identify_resp, datasize); + rcode = aac_send_safw_bmic_cmd(dev, &srbu, identify_reply, datasize); if (unlikely(rcode < 0)) goto out; - if (identify_resp->current_queue_depth_limit <= 0 || - identify_resp->current_queue_depth_limit > 32) + if (identify_reply->current_queue_depth_limit <= 0 || + identify_reply->current_queue_depth_limit > 32) dev->hba_map[bus][target].qd_limit = 32; else dev->hba_map[bus][target].qd_limit = - identify_resp->current_queue_depth_limit; + identify_reply->current_queue_depth_limit; - kfree(identify_resp); + kfree(identify_reply); out: return rcode; } /** - * aac_update hba_map()- update current hba map with data from FW + * aac_set_safw_attr_all_targets- update current hba map with data from FW * @dev: aac_dev structure * @phys_luns: FW information from report phys luns + * @rescan: Indicates scan type * * Update our hba map with the information gathered from the FW */ -void aac_update_hba_map(struct aac_dev *dev, +static void aac_set_safw_attr_all_targets(struct aac_dev *dev, struct aac_ciss_phys_luns_resp *phys_luns, int rescan) { /* ok and extended reporting */ @@ -1839,7 +1841,7 @@ void aac_update_hba_map(struct aac_dev *dev, if (devtype != AAC_DEVTYPE_NATIVE_RAW) goto update_devtype; - if (aac_issue_bmic_identify(dev, bus, target) < 0) + if (aac_issue_safw_bmic_identify(dev, bus, target) < 0) dev->hba_map[bus][target].qd_limit = 32; update_devtype: @@ -1851,14 +1853,14 @@ void aac_update_hba_map(struct aac_dev *dev, } /** - * aac_report_phys_luns() Process topology change + * 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. */ -int aac_report_phys_luns(struct aac_dev *dev, int rescan) +int aac_get_safw_ciss_luns(struct aac_dev *dev, int rescan) { int rcode = -ENOMEM; int datasize; @@ -1888,7 +1890,7 @@ int aac_report_phys_luns(struct aac_dev *dev, int rescan) /* analyse data */ if (rcode >= 0 && phys_luns->resp_flag == 2) { /* ok and extended reporting */ - aac_update_hba_map(dev, phys_luns, rescan); + aac_set_safw_attr_all_targets(dev, phys_luns, rescan); } kfree(phys_luns); @@ -2001,7 +2003,7 @@ int aac_get_adapter_info(struct aac_dev* dev) if (!dev->sync_mode && dev->sa_firmware && dev->supplement_adapter_info.virt_device_bus != 0xffff) { /* Thor SA Firmware -> CISS_REPORT_PHYSICAL_LUNS */ - rcode = aac_report_phys_luns(dev, AAC_INIT); + rcode = aac_get_safw_ciss_luns(dev, AAC_INIT); } if (!dev->in_reset) { diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 3a20168..d81d0aa 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -2639,7 +2639,7 @@ static inline int aac_adapter_check_health(struct aac_dev *dev) int aac_acquire_irq(struct aac_dev *dev); void aac_free_irq(struct aac_dev *dev); -int aac_report_phys_luns(struct aac_dev *dev, int rescan); +int aac_get_safw_ciss_luns(struct aac_dev *dev, int rescan); 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 f70f112..82ddc74 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -1945,7 +1945,7 @@ static void aac_handle_sa_aif(struct aac_dev *dev, struct fib *fibptr) for (target = 0; target < AAC_MAX_TARGETS; target++) dev->hba_map[bus][target].new_devtype = 0; - rcode = aac_report_phys_luns(dev, AAC_RESCAN); + rcode = aac_get_safw_ciss_luns(dev, AAC_RESCAN); aac_resolve_luns(dev);