From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: Reinette Chatre <reinette.chatre@intel.com>,
James Ketrenos <jketreno@linux.intel.com>,
Zhu Yi <yi.zhu@intel.com>, "Luis R. Rodriguez" <mcgrof@gmail.com>,
ipw2100-devel@lists.sourceforge.net,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 11/19] drivers/net/wireless: Use PCI_VDEVICE
Date: Wed, 24 Jun 2009 22:13:27 -0700 [thread overview]
Message-ID: <10b896c1a1e1f65a4a342ee5aa3452ab8cb43dfb.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/wireless/ipw2x00/ipw2200.c | 10 +++++-----
drivers/net/wireless/prism54/islpci_hotplug.c | 4 +---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 44c29b3..d726b3c 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11436,11 +11436,11 @@ static struct pci_device_id card_ids[] = {
{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2754, 0, 0, 0},
{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2761, 0, 0, 0},
{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2762, 0, 0, 0},
- {PCI_VENDOR_ID_INTEL, 0x104f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_INTEL, 0x4220, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
- {PCI_VENDOR_ID_INTEL, 0x4221, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
- {PCI_VENDOR_ID_INTEL, 0x4223, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
- {PCI_VENDOR_ID_INTEL, 0x4224, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
+ {PCI_VDEVICE(INTEL, 0x104f), 0},
+ {PCI_VDEVICE(INTEL, 0x4220), 0}, /* BG */
+ {PCI_VDEVICE(INTEL, 0x4221), 0}, /* BG */
+ {PCI_VDEVICE(INTEL, 0x4223), 0}, /* ABG */
+ {PCI_VDEVICE(INTEL, 0x4224), 0}, /* ABG */
/* required last entry */
{0,}
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index 3087672..83d3662 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -49,9 +49,7 @@ static const struct pci_device_id prism54_id_tbl[] = {
/* 3COM 3CRWE154G72 Wireless LAN adapter */
{
- 0x10b7, 0x6001,
- PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0
+ PCI_VDEVICE(3COM, 0x6001), 0
},
/* Intersil PRISM Indigo Wireless LAN adapter */
--
1.6.3.1.10.g659a0.dirty
next prev 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 ` [PATCH 10/19] drivers/net/wan: " Joe Perches
2009-06-28 11:43 ` Krzysztof Halasa
2009-06-25 5:13 ` Joe Perches [this message]
2009-06-25 20:30 ` [PATCH 11/19] drivers/net/wireless: " 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=10b896c1a1e1f65a4a342ee5aa3452ab8cb43dfb.1245906152.git.joe@perches.com \
--to=joe@perches.com \
--cc=ipw2100-devel@lists.sourceforge.net \
--cc=jketreno@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=yi.zhu@intel.com \
/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®