From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933287AbbKSOeW (ORCPT ); Thu, 19 Nov 2015 09:34:22 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:56540 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758502AbbKSOeT (ORCPT ); Thu, 19 Nov 2015 09:34:19 -0500 From: Arnd Bergmann To: linux-scsi@vger.kernel.org Cc: jbottomley@odin.com, Christoph Hellwig , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, martin.petersen@oracle.com Subject: [PATCH] [RESEND 2] SCSI: initio: remove duplicate module device table Date: Thu, 19 Nov 2015 15:33:41 +0100 Message-ID: <5318263.D61echQrl2@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:coz6RC37dR8hDh+1YSGK1aNnpr31LBcli99+nau7H3YYQ7qbf/i x4ZM3oz32jJ+yAzHA7kVuNfX8Cy+Dvm2gu8Wp11HNuwIzzao3LaRcfNh8rDOxh+QSQyn/Dp pG3Y9jKiXYtUbELISbBMWpAi4/VFy4AkUVPRsxi3WpxHc8CDpmYt66X8w5nhpiM5mmDoypB 0asZuhsoQ91VKhfwpAspg== X-UI-Out-Filterresults: notjunk:1;V01:K0:G9NJRLiPycA=:qgpJXZmidUc6JZS0kBg9pm m8LCrUAhl6Tke6q9q5pBicZ6Dvtl1xB/WOLlHT/NQDIvxDoy3s21u7asGtNbKKEkc4IFcJVMe Ewskm/8cAkqWyD3DcrzyrTr9XR8gvFDpa3gvq8nJybULFgHn43QeJHNfTKbuZzvlkprODGARX zxLqlbf79ftY0Rs42859A55zlqMeMpSVyfQD0joOnzFCCf3UL47qj++LN5aCYegMBDuXP0zvh odGUwYjqEALuVbIAq00AFlaZevbgSKYf36RV5yq18WVPm+yezyBSDdNzVxdLxBOC5Bx9RdGDv tHh4TAf8GJqeMphV8NTtwuPLvJ17Sdcp6yG7eWwS4YqxzTrcxm2ubrFx4zwIkGiJKnuyyKcaB vLC5/Kf1XbW6hhzGGvROYl3c6zgQRdMNr7Gn4MXv1ytLA6CMIQXbh0Hf5RZDCroSSFv1XKiRB +gYh4nfemmGX2Uf9ze4bFF/vbSFGZTRpWtYiWsZohyX1XXxtPeruvXHMJFtNKy4IpAAn6QfmP g7qrJ4zcWHHbwsxsnjGKgRHeMNvwLDh59OBRklz3E1AQgDQDDICH7cwSAFC2lIRRKdZOsyQjp slT5lrnWcR+mKu5jmnoIcv2X9Zh9xRTJtO3ao1iv7J5DK6dRATyYbEK3t+Nrd8OZje41A6IKG WzAzEZHCHSj2oT5oqcHDGYFCoW/3GjckdHULVIU+bAbJqGsskiRcrrcgDmMtYGmqQL9lSWXH6 6EPVOJDmT/me/F59 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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") --- I sent this patch originally in January 2015, then again in May, but got no reply. Please apply. diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c index 6a926bae76b2..7a91cf3ff173 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