From patchwork Mon Jan 12 23:21:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cesar Eduardo Barros X-Patchwork-Id: 18105 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 4D805DE0D7 for ; Tue, 13 Jan 2009 10:28:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754417AbZALX2l (ORCPT ); Mon, 12 Jan 2009 18:28:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754008AbZALX2k (ORCPT ); Mon, 12 Jan 2009 18:28:40 -0500 Received: from smtp-01.mandic.com.br ([200.225.81.132]:42839 "EHLO smtp-01.mandic.com.br" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753775AbZALX2d (ORCPT ); Mon, 12 Jan 2009 18:28:33 -0500 Received: (qmail 16546 invoked from network); 12 Jan 2009 23:21:52 -0000 Received: from grumari.nitnet.com.br (HELO localhost.localdomain) (zcncxNmDysja2tXBpdiToZWJlF6Wp6IuYnI=@[200.157.204.13]) (envelope-sender ) by smtp-01.mandic.com.br (qmail-ldap-1.03) with AES256-SHA encrypted SMTP for ; 12 Jan 2009 23:21:52 -0000 From: Cesar Eduardo Barros To: jgarzik@pobox.com Cc: netdev@vger.kernel.org, Cesar Eduardo Barros Subject: [PATCH 4/5] sc92031: use device id directly instead of made-up name Date: Mon, 12 Jan 2009 21:21:50 -0200 Message-Id: <1231802511-14825-4-git-send-email-cesarb@cesarb.net> X-Mailer: git-send-email 1.6.1.dirty In-Reply-To: <496BD04F.2050502@cesarb.net> References: <496BD04F.2050502@cesarb.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Instead of making up a name for the device ids, put them directly in the device id table. Also move the vendor id to pci_ids.h. Signed-off-by: Cesar Eduardo Barros --- drivers/net/sc92031.c | 8 ++------ include/linux/pci_ids.h | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index ac4ccd4..2a111f2 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c @@ -31,10 +31,6 @@ #include -#define PCI_VENDOR_ID_SILAN 0x1904 -#define PCI_DEVICE_ID_SILAN_SC92031 0x2031 -#define PCI_DEVICE_ID_SILAN_8139D 0x8139 - #define SC92031_NAME "sc92031" /* BAR 0 is MMIO, BAR 1 is PIO */ @@ -1591,8 +1587,8 @@ out: } static struct pci_device_id sc92031_pci_device_id_table[] __devinitdata = { - { PCI_DEVICE(PCI_VENDOR_ID_SILAN, PCI_DEVICE_ID_SILAN_SC92031) }, - { PCI_DEVICE(PCI_VENDOR_ID_SILAN, PCI_DEVICE_ID_SILAN_8139D) }, + { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x2031) }, + { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x8139) }, { 0, } }; MODULE_DEVICE_TABLE(pci, sc92031_pci_device_id_table); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d543365..c05bc2a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2208,6 +2208,8 @@ #define PCI_VENDOR_ID_TOPSPIN 0x1867 +#define PCI_VENDOR_ID_SILAN 0x1904 + #define PCI_VENDOR_ID_TDI 0x192E #define PCI_DEVICE_ID_TDI_EHCI 0x0101