lkml.org 
[lkml]   [2009]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 12/19] drivers/net: Use PCI_VDEVICE
From
Date
On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote:
> Signed-off-by: Joe Perches <joe@perches.com>
> drivers/net/typhoon.c | 18 +++-----

It's not a huge leap in readability, but whaddayagonnado?

Acked-by: Dave Dillow <dave@thedillows.org>

> 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);




\
 
 \ /
  Last update: 2009-06-25 07:53    [W:0.156 / U:5.404 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site