From patchwork Thu Mar 1 15:27:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130296 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952879edc; Thu, 1 Mar 2018 07:38:54 -0800 (PST) X-Google-Smtp-Source: AG47ELsLo5Ijhx0LMf5+Glfp6xPAPpO4rzzp+6dYMK0HEWV9FlLvqdcpkyBUX5fCPh8MmNft0D8f X-Received: by 2002:a17:902:7e0d:: with SMTP id b13-v6mr2266566plm.97.1519918734577; Thu, 01 Mar 2018 07:38:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918734; cv=none; d=google.com; s=arc-20160816; b=qxoet6wboRcjVug3gKkY2QvV1Hcg5yiBqwlu+P1/sPE9LJ/wn3eWZWSTjuKGLBk7AU ilHkyrt1s71knqiyDZg/vtCLlmfkV7D2qlkHejUWaIe2FGXEmqkcaNVSbwlFse7FfPA4 M9Oj83+Bmcs5ppvhbwe/OpU9azT5m+KhpI9iXJv6Uyyps/OlfJawK8XR7KK9Sm3Iz0C+ Zss/Uo0wANNGYdIU4vOuasEz9Xxqvqgx+pGDpRFFeLrybkJyQ/SyBoV2zG1laZq/F+fd tD1eTzrWVACYurQnY/2ztCBLqAtqbjLS3ZMCZzwzimS/UaP3rOFlA6oRL+Rwkcu0NeT5 SJ+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=dy6WQ7Hs8ataHeyja+Mar6dcIUfdHh5cdXVRmyR8zo0=; b=AFuYcAAqsnO43zSSouMb+HU4BTaZQqcNvIp23XwQeI2OWMOxBZBSr1kt2rLZWH91qR fFLIdm8jiSOQhyvnweI33dw0hRszzWgF2zJRV+1KKbI7jJQqMzA3JnzcKCQyR8fVywyw 3m9UW3lSbt3HZdi3CXKant5P+HJ3qPto9yLATiej2CUCtrE1GnylchKpiFIw5m2viF4w Vfcq6ftMIoKyYWr8FlCPYxYVBAH6ZHG+5yKMYuJ8svdFvgFkOQFYPGpFoD0ZNJJWPc7t eOPPubnszFe/py1Ro3ej8CSMTBXwsgK8uDfheehaifCh64uRtrjjBtIRigIcGRCC+1vZ ZoeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=l+4JsEc5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15si2586092pgs.318.2018.03.01.07.38.54; Thu, 01 Mar 2018 07:38:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=l+4JsEc5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032443AbeCAPiv (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:51 -0500 Received: from mail-sn1nam02on0127.outbound.protection.outlook.com ([104.47.36.127]:60979 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032519AbeCAPia (ORCPT ); Thu, 1 Mar 2018 10:38:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dy6WQ7Hs8ataHeyja+Mar6dcIUfdHh5cdXVRmyR8zo0=; b=l+4JsEc553ngMdzH4bm/BhOo85ip7nS8wwiifUWA2+tca+svAz645kc+yBy9lXk1PERgWdMK7ZO1pBFTyT40jc9KNNVZObVtGZ8UriSx3qlsAL+vFGZqXhgg8vhD5qsQ/haueLiIdv+M8JvyAqT8CxQmdNIka7piVDcCUitzRrs= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1016.namprd21.prod.outlook.com (52.132.133.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:38:25 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:38:25 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , "Martin K . Petersen" , Sasha Levin Subject: [added to the 4.1 stable tree] SCSI: initio: remove duplicate module device table Thread-Topic: [added to the 4.1 stable tree] SCSI: initio: remove duplicate module device table Thread-Index: AQHTsXHLJMmQMsF/GEGv11etQglkiA== Date: Thu, 1 Mar 2018 15:27:22 +0000 Message-ID: <20180301152116.1486-456-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1016; 7:pKSLtMQAWiIKRPfSFJ5Ge9gGplWbKn5rFE/PMfwaiOUSruYNkyhUEBHHmlrSf/WX2Hr7HceSkCBUmlOqabEwsYBWVMeG2QUrOfx5G+hCFH2VxkLfySD8ZBSNWDO3u+WKoOuCOq36loj8Pl723qlIweh/yvOJuhb8ehRM4paiabQj9LrSwmzSXnci5DIuFIw0QS1oLLrvKswHqkAxoSdbIYZ9cezaO8LWSz4WBJnKm3gcuqq7DoSSpxm+hDA9LEPD x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 3751bdd2-76aa-4edc-f5f9-08d57f8a78f0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1016; x-ms-traffictypediagnostic: DM5PR2101MB1016: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501229)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1016; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1016; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(39860400002)(39380400002)(376002)(396003)(189003)(199004)(22452003)(6436002)(8676002)(81156014)(81166006)(53936002)(68736007)(6486002)(6512007)(97736004)(5660300001)(86362001)(575784001)(59450400001)(6506007)(102836004)(6346003)(2906002)(26005)(186003)(4326008)(10290500003)(8936002)(76176011)(478600001)(105586002)(3280700002)(14454004)(54906003)(110136005)(3660700001)(2950100002)(305945005)(7736002)(6116002)(72206003)(1076002)(3846002)(6666003)(316002)(2900100001)(25786009)(36756003)(2501003)(66066001)(107886003)(106356001)(5250100002)(86612001)(99286004)(10090500001)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1016; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: DSVQba6++htSzEXeYN8WO3l6ie1KXAu3zcxilYuxNE33ROmMSRVzDTWxQSmi2zdLn8/drpAO9VfgYzcCNdCDkoYFJcK4MrQ1yBBZ48+ty5UdNylng/PhlIj5iJKlXy1NgbeRbyZ7H3fyXHznHE22ge0DVmwaTmo/7JjwJvjos0M= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3751bdd2-76aa-4edc-f5f9-08d57f8a78f0 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:22.2836 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1016 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit d282e2b383e3f41a7758e8cbf3076091ef9d9447 ] The initio driver has for many years had two copies of the same module device table. One of them is also used for registering the other driver, the other one is entirely useless after the large scale cleanup that Alan Cox did back in 2007. The compiler warns about this whenever the driver is built-in: drivers/scsi/initio.c:131:29: warning: 'i91u_pci_devices' defined but not used [-Wunused-variable] This removes the extraneous table and the warning. Signed-off-by: Arnd Bergmann Fixes: 72d39fea901 ("[SCSI] initio: Convert into a real Linux driver and update to modern style") Reviewed-by: Christoph Hellwig Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/initio.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c index e5dae7b54d9a..51063177f18e 100644 --- a/drivers/scsi/initio.c +++ b/drivers/scsi/initio.c @@ -110,11 +110,6 @@ #define i91u_MAXQUEUE 2 #define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.04a" -#define I950_DEVICE_ID 0x9500 /* Initio's inic-950 product ID */ -#define I940_DEVICE_ID 0x9400 /* Initio's inic-940 product ID */ -#define I935_DEVICE_ID 0x9401 /* Initio's inic-935 product ID */ -#define I920_DEVICE_ID 0x0002 /* Initio's other product ID */ - #ifdef DEBUG_i91u static unsigned int i91u_debug = DEBUG_DEFAULT; #endif @@ -127,17 +122,6 @@ static int setup_debug = 0; static void i91uSCBPost(u8 * pHcb, u8 * pScb); -/* PCI Devices supported by this driver */ -static struct pci_device_id i91u_pci_devices[] = { - { PCI_VENDOR_ID_INIT, I950_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - { PCI_VENDOR_ID_INIT, I940_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - { PCI_VENDOR_ID_INIT, I935_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - { PCI_VENDOR_ID_INIT, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - { PCI_VENDOR_ID_DOMEX, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - { } -}; -MODULE_DEVICE_TABLE(pci, i91u_pci_devices); - #define DEBUG_INTERRUPT 0 #define DEBUG_QUEUE 0 #define DEBUG_STATE 0