From patchwork Sun May 7 13:34:23 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: 9715437 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 DCE7460385 for ; Sun, 7 May 2017 21:46:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE48926530 for ; Sun, 7 May 2017 21:46:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2EA5267EC; Sun, 7 May 2017 21:46:59 +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.4 required=2.0 tests=BAYES_00, DATE_IN_PAST_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 31D9D26785 for ; Sun, 7 May 2017 21:46:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754427AbdEGVqk (ORCPT ); Sun, 7 May 2017 17:46:40 -0400 Received: from mail-sn1nam01on0057.outbound.protection.outlook.com ([104.47.32.57]:20064 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751874AbdEGVqg (ORCPT ); Sun, 7 May 2017 17:46:36 -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=6MlrBVTXbO98BkqckkdnRP23CshztxqPIL04Qhnk5Vw=; b=HP1r6mXFuM098BYnwOGqvEteLCJPuqoO+to/o6YcwMI8+rhY3ueZtT+leOEEAqNkfuCcB7QgiJFOFSr9VeW/LsDwml9KpkOZFi7Vo/3wBjW5GutX8bJuDXW+MXo34ZuSYYBWDgNKeElYjnWRVVDj9zIFwq00ULZmCmNcBDSCU3A= Received: from BY2PR02CA0088.namprd02.prod.outlook.com (10.242.32.46) by BLUPR0201MB1891.namprd02.prod.outlook.com (10.162.239.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Sun, 7 May 2017 03:19:04 +0000 Received: from BL2FFO11FD056.protection.gbl (2a01:111:f400:7c09::115) by BY2PR02CA0088.outlook.office365.com (2a01:111:e400:2c2a::46) 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; Sun, 7 May 2017 03:19:02 +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 BL2FFO11FD056.mail.protection.outlook.com (10.173.161.184) 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; Sun, 7 May 2017 03:19:02 +0000 Received: from localhost (10.181.72.194) by avsrvexchhts1.microsemi.net (10.100.34.105) with Microsoft SMTP Server (TLS) id 14.3.339.0; Sat, 6 May 2017 20:18:38 -0700 From: Raghava Aditya Renukunta To: , , CC: , , , Subject: [PATCH 18/19] aacraid: Remove reference to Series-9 Date: Sun, 7 May 2017 06:34:23 -0700 Message-ID: <1494164064-17715-19-git-send-email-RaghavaAditya.Renukunta@microsemi.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494164064-17715-1-git-send-email-RaghavaAditya.Renukunta@microsemi.com> References: <1494164064-17715-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)(39450400003)(39860400002)(39840400002)(39410400002)(39400400002)(39850400002)(2980300002)(199003)(189002)(9170700003)(5660300001)(76506005)(189998001)(106466001)(77096006)(86362001)(105586002)(104016004)(6666003)(2950100002)(47776003)(57986006)(305945005)(356003)(53936002)(2906002)(36756003)(5003940100001)(38730400002)(107886003)(54906002)(76176999)(50986999)(50226002)(478600001)(4326008)(8936002)(81166006)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0201MB1891; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Neutral; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD056; 1:eI0W/A4/NaRHAW++Jv/GF+BsSdkmWs5RJQyh8e4mZkXc4MkSJ/UtzTTFpw41irCTrChhM3v8T0oPi0OD6bG+RVBQ5+Exr/ZIBmQxDUr9nA0QdTLBQj9F/qsW342dQp7YdWmneRNXb+xn9aNv8qqB+8ErlISwKd65myPLfLNKDM3xr4M/Y0zL7dsAJ/dOk0vd02tVB8vr1zPFDHp0pe78QyvYpjFB1ND0KsxHzvQKhPcqATSd64xOLiFTzlflNIzylQF3zXYHa2Ny5BoCwfLr/WwLVZKL2a/WDQ7AcTT1FvjEhPEGe4bn8Gc7+Ufp8TDUyxKtdVcnadvn4JqTWaYoVrp9Sij2TCpB5glYpLM4aC8VIyejwpvLq8XLqNyW9eTm2GdVScvCFbfGnHZDHPIdgZIK8VW7CwMCY7Ezd4klNeK5WXDFoHTDC1wXTNYLf4jfco2a4/NEZcMQiMQ9G7md/3V8DUpy6wGuV2Te8nBzsj5dN663tK9xLMHgVisY9FM1wUBUf9vER4xEoO7UiVnR0R62wQiwsOTBXXy396Ae4UQstpmpMHww+wrdG1ifFMAE+35KqgthuLv+6TuJq1rL26/QUxixJRugTT/aXLTodEQ= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d988bd95-30a7-4536-a0e1-08d494f7cfad X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR0201MB1891; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1891; 3:i+3swTXUA9rC+iscHsjJ+YMWJB1z7p7nVRrn92l8v7hquyPhhks20ypSuPwPpPZlZRNe7xlH/IqNla86hbW3786xmU26BdTlN/h4P968JVZ5ddCJoIBl6I0FSnyqWadDVJK50V1P4c0jPDRq6b2wPbTyXdfHydM+Szpmr3eKmTgedRg8B2sRKnuzscoMUtr/FIzrH2meWAgkIp38HXCwayqRoeg9IaeTSMLKqgG1P/gMrXok2/OOsJJiO7bgyNfoDmCgHuNv0pRrd5DTU8kY33Vd7oUJoXaKSk2OqoW+Dg0QbP5W9h0jcVeHSoA8ngoV4K3RA4ed8gD5I5UJu2Pe54h1Xs7yEcM2PuBwfduMBa8ecu/EuZ9YJ1GYgRD0rlpA8ofdYxI7tWMIRDHTuZoOCafdmXDP2UYVNif4oP87Dlz0/ptP/CfWgpaWR3D5cGyrRAjA4SgjIMIf3ETr5j5QiE2gNxdBwxHKQwyItrADrP0TjMwn+v3ORUuAyb0fk2CR X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1891; 25:TjiB86Z8splX7Vn1y3+/sP4aPuE6FxC6d54TtzyqU8GSEifboETLR3vubW//4bau+ckT1oGcOvPjFmi0hkh270s71JeQPEDETAFJtFGl+d4pIpz6ZDqVB4e+9+UvE68jpo+jM5oQzTuTTJiR4rucn6Wv0GHoGILcctIL0fwvfWQ2E6+Hz5oN6g8h84o5CPU8wjlBWLvLknisoEHvp4kYj+M4PO7mIISh5EQSsHBjqCjjX+JcauPWth6jysv8f2zNhNzEXyJCtuQmoY5jrzvVHayOYzHrCv9GG2w/G74DsGQ7tJT/fIyVpWMf+4eLTwlYwRzhhtf3kWeI7I6BxcFOJLciK+OmpKH5UTPuO43BijCt7jUMJFMguWHWTKPR/4dqxW2XjBKE2f2OFWQzvzNFrSb6AELxdna898IXRB93pGOH9cW4kuXKmGl34hmkm3Kxe6Hu+nvMHLP4KPss3tdltcTNKX9HvgJbkIGFbupBrsU=; 31:jyiVULsWrIAUEgm+Sl938dZQ3Y2/Uh1Bzxo5vFnHT77GHJ/C8sNX7c/2yes5XO4rchesTS4e5ighmKDLr0idlvoIMJtaB2qx0I1AUAXeXyY/7yH0UxbTb5I5to3ENfDn4g1LSt6W4oMLstJWzPyzQGKGRxeuPPLnk4IoJcaCuoOri/OjmrSCC/NKcY09mK6aZ0UEAn4RBZZUAczR1ehx0SEB9YluwaJi/gRBAazNPYpQe18txv3OJ59QPFuwrzOf9KUmnSQIQrLPkfc9bDVUUg== X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1891; 20:sBA7aK4xMsvCBKOsmZ0n1BeYhmoS5ePmPsXvR3+zpp06uUzaJO50fNTrizzxfXs2QkNhdvDmaTu4R0Ps4E2la5XONQXFxD846s9m2ZwWc0CYFq2MuE7sR2O81m+Gn6wJGOgMLa2Js5NSEfV1PoyNpqusZA8QZngY4YnVCJDfUOnoehzHL9k17Ua1jK99oEnSr0zb1Qoy2uC2RP7jVhCa4T59qq5+HcAYTmdHOgrIHobbDeFFMqkLZWtRs3gA9Xurf4SBYouuG7uTOHDQm+gG1NetWhipmVQESN+8ydZxoLyBhxdadAmTsfy0rskcxuJcMtPHdicDNZIuHOvXYhWXM0/O8mEFbRMDXgLs1OuJ2s8keFCSA9p3xuC7b11rg1qt+jNdcU7QGDaR4rIuH6h5q4AAWLi+LfvQN3oiux0UD37yBetqiX9xqv7/bG1gJtTdV02frqXikLVYh+IQ56PkWAa6j+uaVFzAWEOPeYgvD9WuvUHBdalUd3DZPytVmveY 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)(8121501046)(5005006)(13017025)(13023025)(13015025)(13018025)(13024025)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041248)(20161123562025)(20161123564025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148); SRVR:BLUPR0201MB1891; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0201MB1891; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1891; 4:Vlfbotc5p6899jjFQHC3qUVlEJfY1MXEUbLEWQkDGG+yScYmmceLEpUZyMpJTWQcJC3YymCnyWlmoXi5boB5VTRzbIqmsS4pN8NBSsrTi/zoR3gCJtM1szSPM1s1o9LvDoidxbJ4vpSkW3lC0KJg0LKXvlL/r4yT6FzEyaWRzomztz/Eb2YNt37skIUq5MLRPviZXn35K+3GuexKDJZ8319SOl18iZpyWd8KocJyb6EDm4z6oDovnozNxmSK99HwtfwfWi5UNcAS8SwtopzcolVWDXoghbPPTHtEirLWmTrDKyHySDKfP7niFnGyjo9aPLGRq7BEJFNF2eplOviCwibJiL+sYyTkSG8e00/Cwom3ofwIU+XXgVawFcwXcKOlG8if5J0L116eBx/7cWi63t7PHaoDTrJ0pTH8iDI4vhL33DtqESX/WGOS0DBUE/Ldo4OPq/WgCyodjHPp+zXbBHsd9QnJw+LVDwMO5+0nDU9xMZCPrqKMpcKhy9wTgqiMdgFSG4OPossZ96pr7Bo6pehbCnfdmDWDcCO9KDOzEw2h3lSMF95chme+dULS5zkZhwkfgirUBFNUT70xAarNPDW2vshJ094cBRycLUHtgP7SlCCiuOeMYjGi4p7RcTRLchrnE0DaFjpRG7ilAVr8vKfrJ6g2hAgik+2w+fUs3g0Po3K9mAZya/wVartmUbHfyGk6h9T892ohNogYsZInYTl3T/5wtOw2Ha349Z8D7/7VsPumwgpK4IXhJSyORcTdJRaosxY7UpJIOmX0oaH16Izh3sL+p2gsfBG+9KUBlsg5wo7uZKC86LeGhZwG9hM1c1IYE8N7slugXhlI4pqYP5l0cZH2q62exJdagBDNv3i0Ic5N6iPWW3QuPeFFIyDGFzBZeJsNeEO2py5Hm5Hrcm2C7ozshU6ATgzeMvFo 9k7OACpBW5tdaFCpMLCvEIgM X-Forefront-PRVS: 03008837BD X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0201MB1891; 23:9+WI9Cyh/gX9hrUGzKUkvqXy9e69HEcnuPoote5?= =?us-ascii?Q?8/YKPC+6SXuABhQ7lcxkEP+VTmvOTYQUq8GjQJzIcduNuihlGBwkjsIP+Wu3?= =?us-ascii?Q?BvJgikEQqW0TjDywQc9L9ljwKHiVupD/8qK2DYOhnPdFSsJcW4KMpkcODFL9?= =?us-ascii?Q?iBQ+GKP49itoGqfHPoA3bqtzgkqVv4MDMx08PL0O6TIxkC6pEpmuSOkiw6qX?= =?us-ascii?Q?WI8vLqI1TeIjCJlSX032oe4XKYdpLU2JdW6aK/LFI0O194ghXpHM7lqfWrne?= =?us-ascii?Q?X16TO7uEfVCX6dj54DtZU5YFl+c0uBXHp3FZ9Mocj626yPGom+k0Ta6QEt2l?= =?us-ascii?Q?6tv5t9qrBwpsyOGSo2xdkz7H0FFeFDym7qg8D/tK4trKVzipjkkpKhnJNxf9?= =?us-ascii?Q?rexweeAtRLKnTh+lTIT64uoBWI35cp3czX243O3NdHxFgw9w6W10R2ryJkHu?= =?us-ascii?Q?7Ex9RiCvOujt3uyRbQ63pUxbOOHMwc5LwAdP+SKb0OGpx7qx3KCvWQ0hTN9b?= =?us-ascii?Q?wVhGP3aP6BcwtphdQXnfhkTRDKBRIvKYbhNrUgsV6wN26QgUtsDAOqLo/l73?= =?us-ascii?Q?M40xK7iI9l/D+XPh9a4QpWVHpQFY0kEPUIWQxWexCQOJ/iRhSKV2FEpU0PbP?= =?us-ascii?Q?Jjqs783Nv+gxAXM0AdiGezH4vswZ1e4neTEPqfS907JwqUPdCmrFmxfLzuwG?= =?us-ascii?Q?4hs4pNjTreRuwJn0Tf50h0s9qyv2uLbCZtMllLbsJg/yASRiNOYJVrzpk5/0?= =?us-ascii?Q?ni/tNOfCIi0q8Fg9bOqZrs0OJxksUxo9LGCkw8Xhvb7Fb2ZqHFnNCOL/kiQ/?= =?us-ascii?Q?2N+cnLHx1wzLe4WDzChT+D7GmpHOqKeJrc7yxpA18Pfsm09QBXf9DiH7DAAF?= =?us-ascii?Q?TRGqT514ovYzrQ9cYORQMod8mIaQKdqtJqJoyGaAn+L8gytGBDTwJEL0OdSl?= =?us-ascii?Q?Lmgaxl3UL5cYPuiqQVv1twaSlTc3jb6KGz62zpwgHoqYZqkw+mfSnl/9v8z4?= =?us-ascii?Q?+En7omp/Odz/qc6ynw4Ddr6SI28MZQu5lHrqsPlnGW9oZtA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1891; 6:SiKcc8hj8oInM+kzdUV0y8SLnZMom22Fn9eaFAjb9w12cBIEXU+xoKRMOuXJvpUiSwvdTvOYVzG5ZvK0SuU/L8SOKc3Dv0umvtr9YEpuOVg8i3S7ZJ17h+/RnSAirrnAL/Ju3RNsE44qLkK06A3/+FEw3Ckt16GZ2qpfk1WMiTnBnnZw8CrdyKFNqIEj0pyTpPrp8MHO7oR352ffVqZVILB3K1/4wrpPgepiBIQh4vs5JI1gTp75WQbPqWvc09Yq261gynUP+GCNnbXsr9FUDVS5m+nG1SR5KCGC8aP3WKeICV7sR2I7DRisnSB0wQpw3SlvJ20vMgccJAF0xs3Ih/2eSGGshq9wRSYLGWYmFedoxgOQWsqMcTG+eM+e3vchJUtKBpDFeIJ/sWuaWtFoZKO3L4+SDD8KDqwLPpRM66ynK9nrj4hTGat/wt7mtyfB940trBcLyKJ6KSevza5Ke41eiEfXzvIPTIXVxAv1EaAft4aCWD8zAHsaJzdgE/NaIb9LHEMs+ImVHiu+NdFKl1s2N0wNNAhQ2LvBqX8g8hA=; 5:8b8YaGUFDsXWVayoS9CL3y1kVm8rsdz9gzkTLX8RTbNYlHGVX0/7K86xeB6sI73UejqDgKFTnTiRn+O0rql2r8jZJXdgHexUcWM+gV6xF4b7RGhEgPld9NbFKom4TksH78bO0Cfmvqc7wcTmSIEbQA==; 24:+efpAkFgMJaOsDT3PzWlWaU4ULGKsCQGWO4B+BEos+WcBaIP7QQt1dLZlVo4dDzQlK+Ofuzdu1AnSxHQMDbrlwHJDkRAyI/BJJlhdP3hjYE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1891; 7:zA8EPuL32e6PAfBcCNHEOSOY76dA9FR4k39xevacWy5m2TIX1Ha96SxPsNgb2uORVATJ6cnlF9qD0GFQPk1iF54774s4gzufbwy/7ekNNmzQDxcG8wWj830sBuezRwRArApbDhEU82WPacGbCAS4w6P/te/BrZVL3YlldYLBivJG7vFwAirfcWAWIHn+rr3nLLzz76kI+6KMiseCnn529I9UvHbCsdCuAd1p+CKcMqPeZrH8VZrLC2yM5E2UWn/mE3oHJc+DdsfY087t+sf90LGt094CdZPzkUS5WgFrrhiZLJpChLXsFevcjYlQP+pGf0ThEB7CqQfQcURTDVK6Jw== X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2017 03:19:02.4902 (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: BLUPR0201MB1891 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 Removed reference to Series-9 HBA and created arc ctrl check function. Signed-off-by: Prasad B Munirathnam Signed-off-by: Raghava Aditya Renukunta --- 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 a026790..184e9cf 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -2595,10 +2595,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)