From patchwork Wed May 10 16:39:52 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: 9719279 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 7D62660236 for ; Wed, 10 May 2017 06:24:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E915284D5 for ; Wed, 10 May 2017 06:24:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6212B28557; Wed, 10 May 2017 06:24:42 +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=-5.0 required=2.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, 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 99B4F284D5 for ; Wed, 10 May 2017 06:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751929AbdEJGYj (ORCPT ); Wed, 10 May 2017 02:24:39 -0400 Received: from mail-by2nam03on0041.outbound.protection.outlook.com ([104.47.42.41]:21332 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751901AbdEJGY3 (ORCPT ); Wed, 10 May 2017 02:24:29 -0400 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=WeDOflcs1cgvB+UT3Q3HER3KZomQUxXzu7etVwVsm1g=; b=DBcvF24iC3wBTrYSnfxlzlJizV99gL1R1ad24OhkfLpURVEGA/gGLs8/UPdPMWUKeRbktNA794GyKJxDoWyDyYGOo9MXFYqOqJrfLvC13XD2Pp+WWYkmxcmxkcYCVOQQq1Hd4bYEM1ZcLT91O/bLV1M9eA9o6M4/AG6ktHGmML0= Received: from CY4PR02CA0035.namprd02.prod.outlook.com (10.175.57.149) by CY1PR0201MB1898.namprd02.prod.outlook.com (10.163.56.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Wed, 10 May 2017 06:24:26 +0000 Received: from BN1BFFO11FD011.protection.gbl (2a01:111:f400:7c10::1:195) by CY4PR02CA0035.outlook.office365.com (2603:10b6:903:117::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11 via Frontend Transport; Wed, 10 May 2017 06:24:25 +0000 Authentication-Results: spf=neutral (sender IP is 208.19.100.21) smtp.mailfrom=microsemi.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microsemi.com; Received-SPF: Neutral (protection.outlook.com: 208.19.100.21 is neither permitted nor denied by domain of microsemi.com) Received: from avsrvexchhts1.microsemi.net (208.19.100.21) by BN1BFFO11FD011.mail.protection.outlook.com (10.58.144.74) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1047.9 via Frontend Transport; Wed, 10 May 2017 06:24:25 +0000 Received: from localhost (10.181.72.13) by avsrvexchhts1.microsemi.net (10.100.34.105) with Microsoft SMTP Server (TLS) id 14.3.339.0; Tue, 9 May 2017 23:24:07 -0700 From: Raghava Aditya Renukunta To: , , CC: , , , Subject: [PATCH V2 18/19] aacraid: Remove reference to Series-9 Date: Wed, 10 May 2017 09:39:52 -0700 Message-ID: <1494434393-17261-19-git-send-email-RaghavaAditya.Renukunta@microsemi.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494434393-17261-1-git-send-email-RaghavaAditya.Renukunta@microsemi.com> References: <1494434393-17261-1-git-send-email-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)(6009001)(39840400002)(39400400002)(39850400002)(39450400003)(39860400002)(39410400002)(2980300002)(189002)(199003)(9170700003)(189998001)(36756003)(50226002)(5003940100001)(86362001)(81166006)(107886003)(47776003)(2201001)(53936002)(38730400002)(356003)(50466002)(54906002)(104016004)(8936002)(305945005)(6666003)(77096006)(2950100002)(8676002)(478600001)(106466001)(5660300001)(4326008)(76506005)(2906002)(50986999)(76176999)(57986006)(72206003)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1898; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Neutral; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD011; 1:c7FTNiK76CfvPelyX34hJeJAiGUNMM6atMb0TPeuDXnSQCJy+slRF68zqJur/HRjBn5P7D3Ylt1lNCrh1YvNmi+poo8uNkuGOKjwz2Vl8xgrE/UuLTYLGYJkazH8TR2cP6jd/DIHDudUqDlLy5Irr3MwThJagVhQUVMaNDadjhnZr7RbpvK8Bl6SKi8LR/O8q2qHHs0B18P/weigZR+BlWnUJaZmB4z9ypQvY/HhbKtJzIwmfDnUmyPPbc2uU41PK/o1+oHaSPnzjb/Y18e+u6stWBE2Bg8KpKCjiQX+T3ZIiFrtKa8qVYhVMldVQ3/E/H9+lrs68Js49xnoy0MrUYjcg4xzYYmqIvegSG9o7quiv3GM/RB0WBPVwA92rxI78bGZZhkp8TZJw0ZIPwOsOIvNyyxKBKRc2qRdcgEXEbInalV2tvzuZ+PdwCc6rFAByRRBcCp8Tq75Riy7of98hsmnP9X37EVa5OYqsRPURokrITuBbiKXnFyMOlHDwPzDEHFxgpg/LcpzDMmCWCP6njczV50rpaw/kcHurYWi1c8a5bRPnhbF2Fyqs9oAd4A77FuGJjUaehlidaJasBQgIDPmQWUWnT88qvP0AurlLoQ= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ac8eb38b-b3c0-42e7-5f2f-08d4976d34d8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:CY1PR0201MB1898; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1898; 3:QDDmN13iH3Nh9oWvx+pwp39MLWztvQ0NDYZb7j1BIm9KxOdLtz+wcDzMLLSYOvB5SfW1h2oKNQdFRWJO0hH3ia68IgCcdvmY/vTnjcNqtyKRC0y3KdnbzFKtZ0V9aKDd8BcwH7kG4UzstmhqnNOotkOlUWD6Xq0xSPSRDBIpe6GVH0VcY0zNgw089bf+wIEPgPx91qDsqIudCDVsJnQ0lXS+Gc2AxOd4gzYrP5qJJ3ONUu9mjOXikU1hR9ql1Lz4e1BHzshDmkT4Jx2JqYPlqGYfIJIpWWadOVknoxTIxxdSaA4/hQrZ8yJ/uzKD7JS1oiAyeLzok2T8nj9xMI8RhiGj4JAdazaFNYuSlG3ZPt/e3rG7B+Mpfa/ZUz4A2QwmzYHb6R83XYtdCynMpZGmnBY9hTO7YH5UaDii0ixQqPppBthaAdk4O3R1ZQAEQFA0ya82wdjWzZ63I14iaWyaAg== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1898; 25:JMfoIb0hc9AwYZ6fu6xgAUWCVqvqfwcdkIq9w1JTn7LaBy/hNsNkcC4EGyC/9NkkdC318D66r1kOFPUxVnwY9QAukYKJnq/HK1LTfK2Rj6PvsqhHoB0v6pPw+ZsQI7Jj54/CXzl89b2x5t95xYgcK3zUqb7ZPTksaNWu52DIuG+MiSFMJAAH4nR7xbT3M/5SSbfYsAfiie82cDN2y26cYdSaTwzhbIV2502yYtL+kxoi+O9KPw4c6y6fx6nDPl0rVukK6xKSdyNIUtHbCi8JnaW75dOMBzRhh2Glqv5juF3XTU9SMV/rpgiM+P9gBktExrftgzHyz0A6GJhhOQScrwn5I9LX9WK0I13GDToDlNJQXXVSnZSMoioWphbsw1/uBCrREAvzcBKbX5x2IvnWHEEqAEtlkez0UsZb2VQCgF3DZyOe0NCsxxVt2BvGzRqFbQrfLSKmH2nRWhKNVCLVn18Gw5Ayz+sNB55r678UAs0=; 31:uYilJqsCtx7CsUPsanj6SZatqdkUma8oFRMfchfNsipIIe2O53cDBiujFPgfZMyLJcbP+EqIIGqKXyF7wUIPtwelUnhpNiWmbfLBza/YULB2Ybwc7lkOxmxzeoDkiNYDMO/HxVjFSqmZ+CZXmKkSjuFq2rmaOX33a73b58tChyovi+n1JEWssVKqs4MyX8kHkEV38fjkY91nSnQWMV1wW4HE357Elo3GENF4DHKVAiIn8bC8fQndwH2j7RetRm+rYi4u2hnR02qcPwFWR1Ooxw== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1898; 20:qJj/4TPl880LMfOwSrssXHPsigTwRLEvzY4G4VG3nhkH/MrHMQVPGeU5pp9A/fs3kl+UXFLZVF/dpF21joilPgPk0a80bCL58aZNbFINzVPZu4bIJzVK3z8Pcnc4wM3BXqOsrMIwCz2ebeoiWqrfTRw88VYhqF61Kq/wv3hIrJo7j6ox1/Q6jbwdmeo1IY1fTWwH8C6Hro9NrtDhFsOxFUBdGREn3ExNEFNDVnhDwLXm+ShGG1daeFxpjjS12E7w7P7jj9UJ0gSIWNy7nnAK+2NWxzTSCJs4vu0KVpFt5vNaVwGj9vBfOvKLYovV+s/K5wIhicygcwweIRSRw4lVg6+Zwgi6MG+IF9ctutmCznj4S835YqqA772jc1yvZwNFQzKyRsv5C4LBVjfYJQICGj5WB7vHOKZ6udoybGBSDTiYi46v0fkjoR/hm3IGIgu0fNkjvACqeYbk7JQR78FPSWO/h+jinLRDujm4pN0UNGvjFjZTN5iPc3mWTZQHb6Sl X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(72170198267865); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13023025)(13024025)(13018025)(13015025)(13017025)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(20161123558100)(20161123560025)(6072148); SRVR:CY1PR0201MB1898; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0201MB1898; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1898; 4:sfL4G1sgEpb8mTrlHjxi5+Xwj/wLb9CgB2fL3b13V1LikYR5eSpTV9q/U1bXYTekYgl79MMQU+uwL4tRc/FXRsudiOKpXQulMbX+E8uvlpxZ0q+0cz8fyqWUklA5Hm5+qq6SD7OlSJnGU+r3DpFMcqcr2/AkeupjIGEwt9XD2u+StJXRnSr6y0tMdS+9wiH41TBQFXzHjgXdp78MeajmNAvnKzB+Rfww5TEcjsBOK8Q6qxBHC7ouvaVF6Y+krNZvR3AEt2PJ63PeDNBUJ+qhOz/RKtbc1suKh612wwXwJz78eAWP3zEn4B1Ih19oq4gmwzD+iGH9Xcjh2bsuJ9/BayN8ZI01O5kcltZktv9rtSG5kjW35wEriYt+qFT1ZPVtX6N5CANt0BlVKDjgM4hq9Cu1KroszIFbzagf3Xa+PbsqPsZmZ7C788j5GU0AAN1HOukBndSVlL+LbOhP1kUMwjxVTWg7GpMwtrAgOWauwTDeu4xQtj11KqCFWIKgrH3tSV/KjaGY8F1wyCDm6Q4ZyjMgwmC7KtOg4d/urhLn5GKwiIt+mDtkATN9CVi1xaxR+xb5Gk8/L1TtpUcfF9EDz/zNmc/ukGIsdpRlRG630V+JwVHcbfb/Tj2MFWg/51Cyzzuocq5Wyi6gxyZVkHV5JkLECxpIDUBQVdBiiBmB0o9ePoWOPO1CcR+8qAaZl5ihXe05dbEDiM2MUjx0P75HkhilSnG7RrvWwqNm5jImaU+IZGlHINih0nCt2VefB6VIQtxkRL6CSPAVsxtaFQ5LtHEffhMmsHHe/V4Z+I9YJyHRlArgTRCXmchgzkHwkUxCbvFf0gyJfXAgy+pDyM9mNVEdrVJCwIfZVKpSIUlMvwHFWlmOzpU061k83qYPnqI9gZGI5BT/tRBeul/xwNd3nGIMbj2rPwcabS+lK/l3 GNFU3Uj929EUipI34VozS/SQ X-Forefront-PRVS: 03030B9493 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0201MB1898; 23:/K7dxmucuYowOAcbJY9+G8t+SIDBW2r2kcMz1/X?= =?us-ascii?Q?twEAPd7ShkkqEx0zCz7He9BYdx86T2H0WKskEOU83JOiY3YGSJAf8qDGNBwJ?= =?us-ascii?Q?dTc535OuoGa+nox/HpfPGf0F/q7zXDqT7zeUx4pcxODZoIy6lIk6oOTO+JvX?= =?us-ascii?Q?B1B2y8xquwy+eMOwCQqLMx49gREKCxamVuA8g0opGmTPBkaUrAErxkCvIy8K?= =?us-ascii?Q?SM6BzfMl/EHvRB5t1SIbI2HfjNU9jw8G9VWu+o9tKHlOuRVTG8b9e2+1OcdF?= =?us-ascii?Q?5x0wW0mx/kDYfblUsyTXvMSzmo0OY9cYW05Zzc0WfFZ+8dXHuPvbPTV0D+l5?= =?us-ascii?Q?QnY7ayt+ZBBFi9TJQUsZxwhieDxlsYFudq7RR/q/rtAW91hYxRO6X1nIJdD3?= =?us-ascii?Q?x7/sZ0d220J5X1w27XxwYwHuTvd7VkTm/7U9OPtDNJGbIrlTwwzl0ZUIi2gX?= =?us-ascii?Q?RYuTscZEVobT2Y8Gx6hJ9qR3beNn6cn06ZN6ocdhJeCBdlpIeUIFbMOOXI88?= =?us-ascii?Q?sovdHMCDJjVhLOtuQ78p0EDJsxOQRYFKYuPCQDcLeggf4InTabeoJVe+fC/q?= =?us-ascii?Q?uyzuPzkDUtVMlumVNeOgbwuGB9xuYq8ymrpgNHjiV+FIWEKT5eve+3jC5ZI2?= =?us-ascii?Q?AVyhdmq3xxcwsC2g7gHGE4uGD4iuj77z/fnap/lmjchhbfqRAD7eV2WVcPAp?= =?us-ascii?Q?MwiAjPy+weNgNgXJOBVwucCcduN6+AlYSAPvOlztSkcd5R9JmvUPYohItlBT?= =?us-ascii?Q?LXHrFWPwme2J27uL2vYkNEJoGz0OcxaawLqE/cPIeME1ayzBj8djiKdgmszK?= =?us-ascii?Q?HaY7aFcFACqU3vjJrYJzhIfOmqAye4xLR33Be8Uwb18hGImA8AN8xjHMCtD2?= =?us-ascii?Q?L8ebjoIhLUdueyE0Ulz4Knh7tjE5iJzDD5D4qRD+z1n+PwQxAHyhMBrTihn+?= =?us-ascii?Q?M9GedAla+2AzxFpuW2h4/M/W9Z3LFXVgeFsQFWKki4cF5VaZjTwwPi+f2woN?= =?us-ascii?Q?4vFCYkx3//2EZ3Vo+RyejzFVUYD8T3r1WXslTrQjlLq2ySqJCYNdRTGqRt1g?= =?us-ascii?Q?aEkW1I94oW41efTT5eBjEBj1/Vc79ixSw0o3DDpWnEiR49IpO9w=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1898; 6:1JyfTwYYUbWDlr3NH3zb3HQ5uu+jrVcTu709P3sJtK7WPt+Bz09vKtyNxexMbIsdt9IJ1NLJo1t58nxZePi+MjaAeIRcHR/xeEpK4CTNnq8YkAXaM0uz7Td0rNHdX9iIY5wyNSQeLiDp3/v4p4a+G3QWqg7WdkBuIfSbYe2tVqC/rgMuSNiEZIAVIym8bV1M2R8WHel2NRBuWFpu2qCKOPeO6iI1GOE1CZL4wwLVPXgpNk5K1asFPxlnXiUHfqUXv2huRWtUAkENNuZZgh2QhY+rJilRQe6OWiSvuC3YLas9yL0BN+Du9aN+FjH5aOhvHMsF8VG8MNCTBOf3rT3YXD1AD651/gewZDrDzSco64Ec48ZEYtcMvr66Z93KZz7tj2CvjmRQA0ASWWzgTwOhSQ5dHvKQbMCWrHXbxp/dbPafADSEWgfahpXrK/Ba2sOo559INuv8waX8yNIhdtTxPvpl7b3cZjr32PmAFlZJGjwrPxyHp7B4cVskSBY1nGM6sLBzwcru8Th0SQokJqsyzkn16JckfNHmXGvqR18sBaM=; 5:DnOfrzSuca2kRsgUAcWX62ZVPzeqYBVZJvMTisIlKllZOE2VK7UrWoiSj4Rt8bd1EBNU6eKxboifif0zHuyCExqGRW2VRbyXLJbf4DFUYfMPbLG1aD8t4SaPO+XwyhoqbviCuFqmh77f3NUro1Wl9g==; 24:bjOS1mUE+zhDlUdBGxEhjcQeGyM5Ul9Da3q9Z1vfCXbgaJTSQDjOr/4Y+DCrSB9ZadfYraMSP3z7V6g/juY+AyZmG7XzxqvFo25sHPDEsl4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1898; 7:71Yz1BmusgZB51Znqqsn6GSYnZPhmCgQl8TORrTR0TGHtZyM1lJGbiNLz8a7mDuWT4gE3rOjtTVSUcnz0czH5VNFhGjzBjjVkHaUb+ouMF68BrqSM4ZjjDpNtjfVLSWfgPxwnzx6Mi237o+FALfjNPBIU/LKYmAMwZdBvBZKJUsAW6hTVX79yDz7+/YW24G1xWrRmbmee5WSuAja5Wnu4F+jS0V3dG5kri732VQR+Slw5Mm24uWlVJffy2KvIBbPGYTKatwYKdL8QhYSbxy79wwxWcp1DuxKDCYDDSpRmrWTczgXz6EUJmitad/jetDBb6uANX017OFvFkNXJb7I7w== X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 06:24:25.6475 (UTC) 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: CY1PR0201MB1898 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 reference to Series-9 HBA and created arc ctrl check function. Signed-off-by: Prasad B Munirathnam Signed-off-by: Raghava Aditya Renukunta Reviewed-by: David Carroll --- Changes in V2: None drivers/scsi/aacraid/aacraid.h | 13 ++++++++++++- drivers/scsi/aacraid/comminit.c | 18 ++++-------------- drivers/scsi/aacraid/commsup.c | 5 +---- drivers/scsi/aacraid/linit.c | 9 ++------- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 829f3d8..58ccd2a 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -424,7 +424,6 @@ struct aac_ciss_identify_pd { #define PMC_DEVICE_S6 0x28b #define PMC_DEVICE_S7 0x28c #define PMC_DEVICE_S8 0x28d -#define PMC_DEVICE_S9 0x28f #define aac_phys_to_logical(x) ((x)+1) #define aac_logical_to_phys(x) ((x)?(x)-1:0) @@ -2684,6 +2683,18 @@ int aac_probe_container(struct aac_dev *dev, int cid); int _aac_rx_init(struct aac_dev *dev); int aac_rx_select_comm(struct aac_dev *dev, int comm); int aac_rx_deliver_producer(struct fib * fib); + +static inline int aac_is_src(struct aac_dev *dev) +{ + u16 device = dev->pdev->device; + + if (device == PMC_DEVICE_S6 || + device == PMC_DEVICE_S7 || + device == PMC_DEVICE_S8) + return 1; + return 0; +} + char * get_container_type(unsigned type); extern int numacb; extern char aac_driver_version[]; diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index 1151505..9ee025b 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c @@ -53,11 +53,8 @@ static inline int aac_is_msix_mode(struct aac_dev *dev) { u32 status = 0; - if (dev->pdev->device == PMC_DEVICE_S6 || - dev->pdev->device == PMC_DEVICE_S7 || - dev->pdev->device == PMC_DEVICE_S8) { + if (aac_is_src(dev)) status = src_readl(dev, MUnit.OMR); - } return (status & AAC_INT_MODE_MSIX); } @@ -325,9 +322,7 @@ int aac_send_shutdown(struct aac_dev * dev) /* FIB should be freed only after getting the response from the F/W */ if (status != -ERESTARTSYS) aac_fib_free(fibctx); - if ((dev->pdev->device == PMC_DEVICE_S7 || - dev->pdev->device == PMC_DEVICE_S8 || - dev->pdev->device == PMC_DEVICE_S9) && + if (aac_is_src(dev) && dev->msi_enabled) aac_set_intx_mode(dev); return status; @@ -583,9 +578,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) dev->max_fib_size = status[1] & 0xFFE0; host->sg_tablesize = status[2] >> 16; dev->sg_tablesize = status[2] & 0xFFFF; - if (dev->pdev->device == PMC_DEVICE_S7 || - dev->pdev->device == PMC_DEVICE_S8 || - dev->pdev->device == PMC_DEVICE_S9) { + if (aac_is_src(dev)) { if (host->can_queue > (status[3] >> 16) - AAC_NUM_MGT_FIB) host->can_queue = (status[3] >> 16) - @@ -604,10 +597,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) pr_warn("numacb=%d ignored\n", numacb); } - if (dev->pdev->device == PMC_DEVICE_S6 || - dev->pdev->device == PMC_DEVICE_S7 || - dev->pdev->device == PMC_DEVICE_S8 || - dev->pdev->device == PMC_DEVICE_S9) + if (aac_is_src(dev)) aac_define_int_mode(dev); /* * Ok now init the communication subsystem diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 7bb0253..1a262c5 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -2592,10 +2592,7 @@ void aac_free_irq(struct aac_dev *dev) int cpu; cpu = cpumask_first(cpu_online_mask); - if (dev->pdev->device == PMC_DEVICE_S6 || - dev->pdev->device == PMC_DEVICE_S7 || - dev->pdev->device == PMC_DEVICE_S8 || - dev->pdev->device == PMC_DEVICE_S9) { + if (aac_is_src(dev)) { if (dev->max_msix > 1) { for (i = 0; i < dev->max_msix; i++) free_irq(pci_irq_vector(dev->pdev, i), diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index d933d2f..0f277df 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -1416,10 +1416,7 @@ static void __aac_shutdown(struct aac_dev * aac) kthread_stop(aac->thread); } aac_adapter_disable_int(aac); - if (aac->pdev->device == PMC_DEVICE_S6 || - aac->pdev->device == PMC_DEVICE_S7 || - aac->pdev->device == PMC_DEVICE_S8 || - aac->pdev->device == PMC_DEVICE_S9) { + if (aac_is_src(aac)) { if (aac->max_msix > 1) { for (i = 0; i < aac->max_msix; i++) { free_irq(pci_irq_vector(aac->pdev, i), @@ -1684,9 +1681,7 @@ static int aac_acquire_resources(struct aac_dev *dev) aac_adapter_enable_int(dev); - if ((dev->pdev->device == PMC_DEVICE_S7 || - dev->pdev->device == PMC_DEVICE_S8 || - dev->pdev->device == PMC_DEVICE_S9)) + if (aac_is_src(dev)) aac_define_int_mode(dev); if (dev->msi_enabled)