From patchwork Thu Dec 21 17:34:02 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: 10128111 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 509E760390 for ; Thu, 21 Dec 2017 17:35:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E13A29CE3 for ; Thu, 21 Dec 2017 17:35:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32CB029D1B; Thu, 21 Dec 2017 17:35:10 +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 A2EDE29CE3 for ; Thu, 21 Dec 2017 17:35:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754822AbdLURfI (ORCPT ); Thu, 21 Dec 2017 12:35:08 -0500 Received: from mail-by2nam03on0050.outbound.protection.outlook.com ([104.47.42.50]:27296 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753970AbdLURel (ORCPT ); Thu, 21 Dec 2017 12:34:41 -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=R6WL+yZEriPNph4HkfEtWT9Ay37FXytgn8fc11+212E=; b=f+DrKUuy6gpVxTzsxMW/5LFjil7q3P7xEbmCwlq16Fup3CFg/jF9dEIzIrHtz5cag7X2pib96IgNgstefLvJDr/YAdLThz2mLJpk16j5QSUunaHH9vNQtBZgrMekvVTlj3Vq8RY7Gcelcz8LZhvmwqeEfsddPzpO4lS7/fv2Pew= Received: from MWHPR0201CA0063.namprd02.prod.outlook.com (2603:10b6:301:73::40) 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.323.15; Thu, 21 Dec 2017 17:34:39 +0000 Received: from BN1BFFO11FD012.protection.gbl (2a01:111:f400:7c10::1:104) by MWHPR0201CA0063.outlook.office365.com (2603:10b6:301:73::40) 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:38 +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:23 +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:23 -0800 From: Raghava Aditya Renukunta To: , , CC: , , , "Guilherme G . Piccoli" Subject: [PATCH 11/29] scsi: aacraid: Refactor and rename to make mirror existing changes Date: Thu, 21 Dec 2017 09:34:02 -0800 Message-ID: <20171221173420.8213-12-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)(346002)(39860400002)(39380400002)(396003)(2980300002)(438002)(199004)(189003)(59450400001)(305945005)(97736004)(77096006)(48376002)(2906002)(47776003)(57986006)(53936002)(2201001)(106002)(69596002)(76506005)(4326008)(50466002)(54906003)(86362001)(1076002)(575784001)(110136005)(76176011)(36756003)(50226002)(106466001)(68736007)(2950100002)(16586007)(81166006)(81156014)(72206003)(104016004)(5660300001)(316002)(8676002)(8936002)(6666003)(478600001)(51416003)(356003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR02MB134; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD012; 1:kwa3B7ttd6Ezpavc1ekuOg9qoZnrMGMms7DD61JLcxegKNWy0Y0fgEGgZmlKW9X5NkqcWXZlEIh+xS93zmOpfKXiySIMevByOLaTQp3Y1OucLyKvYWEtVDvMhdm4yZyE X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa727873-d944-4801-0091-08d548991387 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4608076)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603307)(7153060); SRVR:BN1PR02MB134; X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB134; 3:Ybfrrwvs1q99cg1SdBTmqrk7IFQw4fT1TuGWhngDDJYTh4Tx6KDuMSBgGvRVXuFOC+REHYBA59ytlE4nGgR0GTmCJjz0RG+xy3kFgoyCqoaqow0DWuFRdM/GSCiIZc06C9i7gF/BiAUqOcednR96jQw/dTI4muPOejTmC0q/JsGDaE0YFBp8xrzI+G4hhT2bOKjlFR9iuJuiWBR/vUH+NOx0W182NUMxj2aweDYSy6zTSkeznBRaAdFk6tbV037JFD2vQLQAYvoDkniJnWFI1lRWg3na4AR+iJBLNDpQwd+6bLD6cxL46Co5ZEF/g1K2ibVfdiiC+LVKV05k84wpZNyUV7dSozP8A2l0saNkubg=; 25:ebP8Y+E3xom+3Ry+/fSGKk59Vn7eb1LKTfVg3WKEYzN+u8V9+jocplWrhBVLa5AdeTxPp8Xtg4rJsPef9b5T2MrAhJfTa/SAu+ul5/odVJ1VyUDgELNu7x8KRNAKViIgFrGB3/czmS/rsgKnO48N+l6oK5KFVyJ8OOvbspSEDdbNG+ZJQ3R2OJ2q6ALQ+c9qMNpLIhSr2DlPqwTHBb6EPd2iqJ3X8Byblx9gXG+jXItnl3LXU9YVMIvR9cTvcwycySRjkzc1+cNW/xPSgf+J455J/fDLjUF1JqtXJsGi21+NzZLAKUza2Mov0U/RMSeBp422DuMeU0QpbyPdnVkk3+CbZDRklQq9I+u35xQ9gOw= X-MS-TrafficTypeDiagnostic: BN1PR02MB134: X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB134; 31:oUlHrUCLpX/foNPBeR2DqZEG6trJJUp0EnwSRw4BkXaCp/bbKXeWq1TvueLeNwigWY3TEymVDySSExfALtSYFqx9VGefaLQCXc2BYXCBeoUO8tU/OMXjMm2oDT+iTXxO5Gple6lnNj/55U1uU6jdLJPt7xKA/6CznQOXgoliQmIV8gAPmInhw4/kSSi8z03FdViDcKb5AWkIb3ytV812gOzLn7dfYkRlYfnISJGxJb4=; 20:z4xkffddxbAF1eTd2Oamr+6AkNFmjEzs/z0RT6zpR5pQGj/pWDVq+BTiD8i7e0q5IS8kG8kFg7aSeGNcL/azwJNNIsDZBuyqwpRmAAYzGZRv1tnPeS10uFcHo+poI0FWdijyfr68F9hln2nQVAMXSRLQaQMmhErdbxVQnmkO8WLlYI34IlZrVtLnS2U8lBZYU7AaA1YvovSLmx9zfTvE/vgCEpl3nDrrAeSBUV65iXfzOoz3TJIWWyhZGnr5q1XfrJKv8vLxAOetF0C7qVoZUfzB6OF1gOkvv4iOiS8w/2Ogas1h6VJ5wXcFukMcQMzuk91U2yZBVsqatVQ27mGTbgGYXtCWvqxDZSGTxXykecaAlckcdVrUwas4le3t8dUmj2WQbHCdv31sGVVP9s+GWdloDjTyKsI32Bl5oHXbXGzBGBTJ0Ftm65BCo/XTDCPUtm/6YuwOf+bQWC8ZvhbPgH4uC9grUUuse9Sy7YDHbPRPjiaDFXqt/WIqOUAANaZTccAXIhXQrr8llNNmF9WmEBuFrM4I1kwEOj/PeaYotu/AAeHs2NhzpVjxCBdQfQ5YUfhS6DGVRnr9l9slX8p4tr0ryH7SjY/BOj9KiAYhyLU= 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)(93006095)(93004095)(3231023)(3002001)(6055026)(6041268)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:BN1PR02MB134; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BN1PR02MB134; X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB134; 4:3bqMdtpsGrBtsRYXXs9BnFLTycEIPndMMuckxcutWMiehfu4szz4qd4IjHdcv+SS2EeoyTqDOCvTGVZlKuwFTaYsZTN2C4/kbIYEmlu9gfBYVRIKKXWcXgIBolcwgwVSmdkH3osS3EF+Ispdfabkl8Kx3Mr1NI/p9XSiYi7EZt+wtSH+W+yHGhFbyytTi/phr+a9VbXU+6VwN//IuEL20x7KuwOFThjRLKy00Z8I5YARae0s6o7gS6JiY5eMYdH5mpl5FCPPCPg+8Cgyun7n3w+oOTpFn4gxylYJxPDv8eEcwzC7NipGlIVFPhL53PnxeY+XgHWwDzLPOr3jqmWiR5W6N6UgJbe/9UWDWXtJJd0= X-Forefront-PRVS: 0528942FD8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR02MB134; 23:Q7FnqA2ByFQNU49bcblw3xy8Qt85ePI110o0VyMhbP?= =?us-ascii?Q?xnAHfUpd/Ao1PbMBtDe8Aknbp5ipj4hxZjcvS/2wYPWm0UVNG2N4WtjSmtdJ?= =?us-ascii?Q?RxZVWBOnk5YxfK2EMAYbV2/U2Y6G1hnRLe3MKnS2Cna04ZHaOQoB48zQixWI?= =?us-ascii?Q?LEZ23t75RyO7lKfi98S8yURW0pKd6hYTyX9+waMnX/YinZIbkpgvmuXJSmAq?= =?us-ascii?Q?I5mNK7sUKXxMK0rMUMgHJO6rrWSqE5sr/wK8jDFjJPTW6pZ/E8k12KurWWK1?= =?us-ascii?Q?jNWA5DIP0o+oEVf4NrYmXccJ8oY0ioUHomwGgB44s2bNCthIekFpjgxeI3RI?= =?us-ascii?Q?NBw8aYGlFOG0qdPQHqHfZkILq3zrxvnEHP8Dz/bK+jIwHWrgCRbh75v3KxWp?= =?us-ascii?Q?shvwcMTaxwfHDiVbY7VKG8y8PO4r6DJSv8sarbjualxggqBwlpDS1yUAlrmF?= =?us-ascii?Q?zxuCyHSjt5BEGFWLmMQij15M+utqd5bFKp9+AG24ZSTT/RWB+f56wHeWFCVo?= =?us-ascii?Q?WwraE5evhHjhcWe0r+nJNRjsSDXiM/34oJqbF6a7sL02pESI5gJ/U2WduwTW?= =?us-ascii?Q?CR/GGQLPuxy1yTt2wKfTZITEfwiAIxVI53sid9Ejxj2W1MeGkkexELh4wTPX?= =?us-ascii?Q?+dXKOyflkV6HnSzEL+Z13yGHaPlGi8fMeIdwYfm+kfoINFWv+VZMKjxFBKAR?= =?us-ascii?Q?eIuNX1hPAtQJwxaCAmhdESkmSLZZfahTxK8S+l2W8jSRd0lmppZhVzg2FMoh?= =?us-ascii?Q?QHsOPq9bt5O+5Rssz2JO9hc3hfjrs6jFXO5nR1Exx8RhQpdZzOtkVLvbYG7I?= =?us-ascii?Q?KZZdEty217dSaFUJ1s0O34cW6vHrV+SGZ61oDS6dHj4sbv8RVBF9/sO/vrQy?= =?us-ascii?Q?lV8Q8kPyd4QXXdMRiRpp1i+oR7lsTt9LRukP9hl9QJnI7saO6y5yYjijFjQ+?= =?us-ascii?Q?emArto6ZWNTtbpk0WqN6lbx2esOCLidMx4iwpvoAbY5X+CAvnab09slPs+Wt?= =?us-ascii?Q?s4eKa/qeQxL6SixylLwyJ3VEJxxgHlGZfCHIAmPZ0toKr31vMkb9tMK9utxq?= =?us-ascii?Q?+/xr+j1bFtvEKTEAZ+OhYncqXg8TnaFyzwovZ16QxecKunL+Lrlbc16f4sv1?= =?us-ascii?Q?s8ljxT7NpQeXHV5XBx7vPltqJ1ZpRQ?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB134; 6:N0nzjgppLuObApot2hDF09ayxnNLCdbDevuMFvb2Q9M3MrOtrO8iiC17Jc3kbNintWcbLGqtUsZNQZcvUxZRqw3F5L9pgunM3Fd2p5IrNckQAqFlwD5bKtc6Mn27JWDDBl2Pae4RWBLah2MihSmGQAealfHyqlcsfAGLtGAvsKf6rezMCZkJyzeHaeh8PFPio7FZKwpsE/BEh6Gkk6mD8Ye0JkmfbLA+bHZflRAxLIhxeRGLIINQlKAkFq8jGOm/1evrA+tICEOjvD+yyT21Rsao3FoYok/tTqUqzWEeK+EN018ULEUd8AtOLv9Gap3nQf6oBcJ3ngFr0ZiF1CxeVGotAJ91X8y/FMOfu6mO7FY=; 5:cwUMLl34enMyiUcr2RWSiGOuwfgU3UHJxljOkDiflVPpRoqNIFkUobpHBgYh+CHjiYXv2cS7wfvIAnlKyFSsTGvC0OH8CGReosMxyoSbvGBVh+TRxzdpCZaZGR6Rz769/irqvAIPL5w4trA4fhk0rarY8DoEwKUz9l/koAel4c8=; 24:/LkE0p4JHTZc85EDFL7Uem8pJUEwgtSwpSoeRCJCL/Vz6q2BGO9o4l3yywseHxR4AtXbZTPZRi0W49kXEfxk50mqkuMfKuzretBsJosdBWg=; 7:6DHZEsqtEeGynLuHf8I8H8RNQ1CGYNbMqo2GrciaBJo6/stUKkKFt5A0RU/C6LSg7F4bpGMqSae19OJs7h/DI7KlGZMTVKI4EU3PYfyVpKrt6NXObyCcB1Y+Huzv1gwd9irvbDzX/JuD4EfYPy+fEJAQoQa+/kIjnH4DvNBTuQnR+t2Qbk8lPQSGCBjn68p2H84ovxNwNwddpEK2bjl3v89VI9tQYQ85P1WsU4NZ/JsSWjoILER8OOivJYq12x4Y SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2017 17:34:23.4171 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa727873-d944-4801-0091-08d548991387 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 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 --- 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 8fb0da7..d6b626d 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1756,17 +1756,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)); @@ -1777,30 +1778,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 */ @@ -1842,7 +1844,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: @@ -1854,14 +1856,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; @@ -1891,7 +1893,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); @@ -2004,7 +2006,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);