From: Tomas Winkler Date: Thu, 25 Oct 2007 09:15:32 +0000 (+0800) Subject: iwlwifi: using PCI_DEVICE macro X-Git-Tag: v2.6.25-rc1~1162^2~662 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c6f3f656e12870b2d3a62bb813515c0966f7f448;p=~emulex%2Finfiniband.git iwlwifi: using PCI_DEVICE macro PCI_DEVICE macro is more concise when using defualt values in device definitions Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 26abc226886..1fda41107df 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 67730e09729..baf6e60d49a 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} };