summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2007-10-25 13:15:32 +0400
committerDavid S. Miller <davem@davemloft.net>2008-01-29 02:03:14 +0300
commitc6f3f656e12870b2d3a62bb813515c0966f7f448 (patch)
treeb6ca554e18b07db182a3c2659a331f165c4dd997 /drivers/net/wireless/iwlwifi
parent12a70fbe57b714a235e68c261267406d6b614574 (diff)
downloadlinux-c6f3f656e12870b2d3a62bb813515c0966f7f448.tar.xz
iwlwifi: using PCI_DEVICE macro
PCI_DEVICE macro is more concise when using defualt values in device definitions Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 26abc2268860..1fda41107df1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2298,8 +2298,8 @@ void iwl_hw_cancel_deferred_work(struct iwl_priv *priv)
}
struct pci_device_id iwl_hw_card_ids[] = {
- {0x8086, 0x4222, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x8086, 0x4227, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_DEVICE(0x8086, 0x4222)},
+ {PCI_DEVICE(0x8086, 0x4227)},
{0}
};
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 67730e09729b..baf6e60d49ae 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4693,8 +4693,8 @@ void iwl_hw_cancel_deferred_work(struct iwl_priv *priv)
}
struct pci_device_id iwl_hw_card_ids[] = {
- {0x8086, 0x4229, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x8086, 0x4230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_DEVICE(0x8086, 0x4229)},
+ {PCI_DEVICE(0x8086, 0x4230)},
{0}
};