* [PATCH 11/19] drivers/net/wireless: Use PCI_VDEVICE
[not found] <cover.1245906151.git.joe@perches.com>
@ 2009-06-25 5:13 ` Joe Perches
2009-06-25 20:30 ` reinette chatre
0 siblings, 1 reply; 2+ messages in thread
From: Joe Perches @ 2009-06-25 5:13 UTC (permalink / raw)
To: linux-kernel
Cc: Reinette Chatre, James Ketrenos, Zhu Yi, Luis R. Rodriguez,
ipw2100-devel, linux-wireless, netdev
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 11/19] drivers/net/wireless: Use PCI_VDEVICE
2009-06-25 5:13 ` [PATCH 11/19] drivers/net/wireless: Use PCI_VDEVICE Joe Perches
@ 2009-06-25 20:30 ` reinette chatre
0 siblings, 0 replies; 2+ messages in thread
From: reinette chatre @ 2009-06-25 20:30 UTC (permalink / raw)
To: Joe Perches
Cc: linux-kernel@vger.kernel.org, James Ketrenos, Zhu, Yi,
Luis R. Rodriguez, ipw2100-devel@lists.sourceforge.net,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org
On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote:
> 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,}
ack for the ipw2200 parts
Thank you
Reinette
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-25 20:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1245906151.git.joe@perches.com>
2009-06-25 5:13 ` [PATCH 11/19] drivers/net/wireless: Use PCI_VDEVICE Joe Perches
2009-06-25 20:30 ` reinette chatre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox