mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: Kevin Curtis <kevin.curtis@farsite.co.uk>,
	Krzysztof Halasa <khc@pm.waw.pl>,
	netdev@vger.kernel.org
Subject: [PATCH 10/19] drivers/net/wan: Use PCI_VDEVICE
Date: Wed, 24 Jun 2009 22:13:26 -0700	[thread overview]
Message-ID: <f333b1dcffc974f1df83e8d005f61a710604b8b6.1245906152.git.joe@perches.com> (raw)
In-Reply-To: <cover.1245906151.git.joe@perches.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/net/wan/farsync.c   |   21 +++++++--------------
 drivers/net/wan/pc300_drv.c |   12 ++++++------
 drivers/net/wan/pc300too.c  |   12 ++++--------
 drivers/net/wan/wanxl.c     |    9 +++------
 4 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 25c9ef6..8e9272a 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -528,26 +528,19 @@ static int fst_debug_mask = { FST_DEBUG };
  *      PCI ID lookup table
  */
 static struct pci_device_id fst_pci_dev_id[] __devinitdata = {
-	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, 
-	 PCI_ANY_ID, 0, 0, FST_TYPE_T2P},
+	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2P), FST_TYPE_T2P},
 
-	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4P, PCI_ANY_ID, 
-	 PCI_ANY_ID, 0, 0, FST_TYPE_T4P},
+	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4P), FST_TYPE_T4P},
 
-	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T1U, PCI_ANY_ID, 
-	 PCI_ANY_ID, 0, 0, FST_TYPE_T1U},
+	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T1U), FST_TYPE_T1U},
 
-	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2U, PCI_ANY_ID, 
-	 PCI_ANY_ID, 0, 0, FST_TYPE_T2U},
+	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2U), FST_TYPE_T2U},
 
-	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4U, PCI_ANY_ID, 
-	 PCI_ANY_ID, 0, 0, FST_TYPE_T4U},
+	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4U), FST_TYPE_T4U},
 
-	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1, PCI_ANY_ID, 
-	 PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
+	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1), FST_TYPE_TE1},
 
-	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1C, PCI_ANY_ID, 
-	 PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
+	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1C), FST_TYPE_TE1},
 	{0,}			/* End */
 };
 
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 79dabc5..d035e8b 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -253,17 +253,17 @@ static char rcsid[] =
 
 static struct pci_device_id cpc_pci_dev_id[] __devinitdata = {
 	/* PC300/RSV or PC300/X21, 2 chan */
-	{0x120e, 0x300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x300},
+	{PCI_VDEVICE(CYCLADES, 0x300), 0x300},
 	/* PC300/RSV or PC300/X21, 1 chan */
-	{0x120e, 0x301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x301},
+	{PCI_VDEVICE(CYCLADES, 0x301), 0x301},
 	/* PC300/TE, 2 chan */
-	{0x120e, 0x310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x310},
+	{PCI_VDEVICE(CYCLADES, 0x310), 0x310},
 	/* PC300/TE, 1 chan */
-	{0x120e, 0x311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x311},
+	{PCI_VDEVICE(CYCLADES, 0x311), 0x311},
 	/* PC300/TE-M, 2 chan */
-	{0x120e, 0x320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x320},
+	{PCI_VDEVICE(CYCLADES, 0x320), 0x320},
 	/* PC300/TE-M, 1 chan */
-	{0x120e, 0x321, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x321},
+	{PCI_VDEVICE(CYCLADES, 0x321), 0x321},
 	/* End of table */
 	{0,},
 };
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 60ece54..c57f168 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -482,14 +482,10 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
 
 
 static struct pci_device_id pc300_pci_tbl[] __devinitdata = {
-	{ PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID,
-	  PCI_ANY_ID, 0, 0, 0 },
-	{ PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_2, PCI_ANY_ID,
-	  PCI_ANY_ID, 0, 0, 0 },
-	{ PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_TE_1, PCI_ANY_ID,
-	  PCI_ANY_ID, 0, 0, 0 },
-	{ PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_TE_2, PCI_ANY_ID,
-	  PCI_ANY_ID, 0, 0, 0 },
+	{ PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_RX_1), 0 },
+	{ PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_RX_2), 0 },
+	{ PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_TE_1), 0 },
+	{ PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_TE_2), 0 },
 	{ 0, }
 };
 
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index e4ad7b6..3bde117 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -815,12 +815,9 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
 }
 
 static struct pci_device_id wanxl_pci_tbl[] __devinitdata = {
-	{ PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL100, PCI_ANY_ID,
-	  PCI_ANY_ID, 0, 0, 0 },
-	{ PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL200, PCI_ANY_ID,
-	  PCI_ANY_ID, 0, 0, 0 },
-	{ PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL400, PCI_ANY_ID,
-	  PCI_ANY_ID, 0, 0, 0 },
+	{ PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL100), 0 },
+	{ PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL200), 0 },
+	{ PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL400), 0 },
 	{ 0, }
 };
 
-- 
1.6.3.1.10.g659a0.dirty


  parent reply	other threads:[~2009-06-25  5:16 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-25  5:13 [PATCH 00/19] " Joe Perches
2009-06-25  5:13 ` [PATCH 01/19] drivers/ata: " Joe Perches
2009-06-25  5:13 ` [PATCH 02/19] drivers/atm: " Joe Perches
2009-06-25  5:13 ` [PATCH 03/19] drivers/block: " Joe Perches
2009-06-25  5:13 ` [PATCH 04/19] drivers/char/hw_random: " Joe Perches
2009-06-25  5:36   ` Matt Mackall
2009-06-25  5:51     ` Herbert Xu
2009-06-25  5:13 ` [PATCH 05/19] drivers/isdn: " Joe Perches
2009-06-25  5:13 ` [PATCH 06/19] drivers/media: " Joe Perches
2009-06-25  5:13 ` [PATCH 07/19] drivers/memstick: " Joe Perches
2009-06-25  5:13 ` [PATCH 08/19] drivers/misc: " Joe Perches
2009-06-25  5:13 ` [PATCH 09/19] drivers/mmc: " Joe Perches
2009-06-25  5:13 ` Joe Perches [this message]
2009-06-28 11:43   ` [PATCH 10/19] drivers/net/wan: " Krzysztof Halasa
2009-06-25  5:13 ` [PATCH 11/19] drivers/net/wireless: " Joe Perches
2009-06-25 20:30   ` reinette chatre
2009-06-25  5:13 ` [PATCH 12/19] drivers/net: " Joe Perches
2009-06-25  5:50   ` David Dillow
2009-06-25  6:19   ` Grant Grundler
2009-06-25 12:24   ` Daniele Venzano
2009-06-25 13:52   ` Jens Osterkamp
2009-06-25  5:13 ` [PATCH 13/19] drivers/parport: " Joe Perches
2009-06-25  5:13 ` [PATCH 14/19] drivers/scsi: " Joe Perches
2009-06-27 17:20   ` James Bottomley
2009-06-27 19:53     ` Joe Perches
2009-06-27 20:56       ` James Bottomley
2009-06-28  1:25         ` Joe Perches
2009-06-25  5:13 ` [PATCH 15/19] drivers/serial: " Joe Perches
2009-06-25  5:13 ` [PATCH 16/19] drivers/staging: " Joe Perches
2009-06-25 14:24   ` Jiri Slaby
2009-06-25 14:53     ` Joe Perches
2009-07-02 20:06       ` Greg KH
2009-06-25  5:13 ` [PATCH 17/19] drivers/telephony: " Joe Perches
2009-06-25  5:13 ` [PATCH 18/19] drivers/video: " Joe Perches
2009-06-26  9:54   ` Ville Syrjälä
2009-06-26 16:35     ` Joe Perches
2009-06-26 17:31       ` Ville Syrjälä
2009-06-25  5:13 ` [PATCH 19/19] sound: " Joe Perches
2009-06-25  5:43   ` Takashi Iwai
2009-06-25  5:47     ` Joe Perches
2009-06-25  5:55       ` Takashi Iwai
2009-06-25  6:18         ` [PATCH 20/19] sound: Use PCI_VDEVICE for CREATIVE and ECTIVA Joe Perches
2009-06-25  6:59           ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f333b1dcffc974f1df83e8d005f61a710604b8b6.1245906152.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=kevin.curtis@farsite.co.uk \
    --cc=khc@pm.waw.pl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®