From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Dillow Subject: Re: [PATCH 12/19] drivers/net: Use PCI_VDEVICE Date: Thu, 25 Jun 2009 01:50:54 -0400 Message-ID: <1245909054.22064.33.camel@obelisk.thedillows.org> References: Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org To: Joe Perches Return-path: Received: from smtp.knology.net ([24.214.63.101]:40580 "EHLO smtp.knology.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751411AbZFYFux (ORCPT ); Thu, 25 Jun 2009 01:50:53 -0400 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote: > Signed-off-by: Joe Perches > drivers/net/typhoon.c | 18 +++----- It's not a huge leap in readability, but whaddayagonnado? Acked-by: Dave Dillow > diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c > index cf25eb4..c0063c5 100644 > --- a/drivers/net/typhoon.c > +++ b/drivers/net/typhoon.c > @@ -215,12 +215,9 @@ static struct typhoon_card_info typhoon_card_info[] __devinitdata = { > * bits 12-16 indicate card type: (0) client and (1) server > */ > static struct pci_device_id typhoon_pci_tbl[] = { > - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0,TYPHOON_TX }, > - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_TX95 }, > - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_97, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_TX97 }, > + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990), TYPHOON_TX }, > + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95), TYPHOON_TX95 }, > + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990_TX_97), TYPHOON_TX97 }, > { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990B, > PCI_ANY_ID, 0x1000, 0, 0, TYPHOON_TXM }, > { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990B, > @@ -235,12 +232,9 @@ static struct pci_device_id typhoon_pci_tbl[] = { > PCI_ANY_ID, 0x2101, 0, 0, TYPHOON_FX95SVR }, > { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_FX, > PCI_ANY_ID, 0x2102, 0, 0, TYPHOON_FX97SVR }, > - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR95, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR95 }, > - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR97, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR97 }, > - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR }, > + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR95), TYPHOON_SVR95 }, > + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR97), TYPHOON_SVR97 }, > + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR), TYPHOON_SVR }, > { 0, } > }; > MODULE_DEVICE_TABLE(pci, typhoon_pci_tbl);