* [PATCH 2/9] cxgb3 - Use wild card for PCI vendor ID match
@ 2007-11-16 19:21 Divy Le Ray
2007-11-16 21:25 ` Divy Le Ray
0 siblings, 1 reply; 2+ messages in thread
From: Divy Le Ray @ 2007-11-16 19:21 UTC (permalink / raw)
To: jeff; +Cc: davem, netdev, linux-kernel, swise, wenxiong
From: Divy Le Ray <divy@chelsio.com>
Vendor ID is not necessarily set to 1.
Use Vendor Id wild card for PCI device matching
Signed-off-by: Divy Le Ray <divy@chelsio.com>
---
drivers/net/cxgb3/cxgb3_main.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index bb0d1c8..d92da8f 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -76,20 +76,20 @@ enum {
#define EEPROM_MAGIC 0x38E2F10C
-#define CH_DEVICE(devid, ssid, idx) \
- { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx }
+#define CH_DEVICE(devid, idx) \
+ { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx }
static const struct pci_device_id cxgb3_pci_tbl[] = {
- CH_DEVICE(0x20, 1, 0), /* PE9000 */
- CH_DEVICE(0x21, 1, 1), /* T302E */
- CH_DEVICE(0x22, 1, 2), /* T310E */
- CH_DEVICE(0x23, 1, 3), /* T320X */
- CH_DEVICE(0x24, 1, 1), /* T302X */
- CH_DEVICE(0x25, 1, 3), /* T320E */
- CH_DEVICE(0x26, 1, 2), /* T310X */
- CH_DEVICE(0x30, 1, 2), /* T3B10 */
- CH_DEVICE(0x31, 1, 3), /* T3B20 */
- CH_DEVICE(0x32, 1, 1), /* T3B02 */
+ CH_DEVICE(0x20, 0), /* PE9000 */
+ CH_DEVICE(0x21, 1), /* T302E */
+ CH_DEVICE(0x22, 2), /* T310E */
+ CH_DEVICE(0x23, 3), /* T320X */
+ CH_DEVICE(0x24, 1), /* T302X */
+ CH_DEVICE(0x25, 3), /* T320E */
+ CH_DEVICE(0x26, 2), /* T310X */
+ CH_DEVICE(0x30, 2), /* T3B10 */
+ CH_DEVICE(0x31, 3), /* T3B20 */
+ CH_DEVICE(0x32, 1), /* T3B02 */
{0,}
};
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 2/9] cxgb3 - Use wild card for PCI vendor ID match
2007-11-16 19:21 [PATCH 2/9] cxgb3 - Use wild card for PCI vendor ID match Divy Le Ray
@ 2007-11-16 21:25 ` Divy Le Ray
0 siblings, 0 replies; 2+ messages in thread
From: Divy Le Ray @ 2007-11-16 21:25 UTC (permalink / raw)
To: jeff; +Cc: davem, netdev, linux-kernel, swise, wenxiong
Divy Le Ray wrote:
> From: Divy Le Ray <divy@chelsio.com>
>
> Vendor ID is not necessarily set to 1.
>
This patch modifies the sub-device id, not the vendor id ...
> Use Vendor Id wild card for PCI device matching
>
> Signed-off-by: Divy Le Ray <divy@chelsio.com>
> ---
>
> drivers/net/cxgb3/cxgb3_main.c | 24 ++++++++++++------------
> 1 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
> index bb0d1c8..d92da8f 100644
> --- a/drivers/net/cxgb3/cxgb3_main.c
> +++ b/drivers/net/cxgb3/cxgb3_main.c
> @@ -76,20 +76,20 @@ enum {
>
> #define EEPROM_MAGIC 0x38E2F10C
>
> -#define CH_DEVICE(devid, ssid, idx) \
> - { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx }
> +#define CH_DEVICE(devid, idx) \
> + { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx }
>
> static const struct pci_device_id cxgb3_pci_tbl[] = {
> - CH_DEVICE(0x20, 1, 0), /* PE9000 */
> - CH_DEVICE(0x21, 1, 1), /* T302E */
> - CH_DEVICE(0x22, 1, 2), /* T310E */
> - CH_DEVICE(0x23, 1, 3), /* T320X */
> - CH_DEVICE(0x24, 1, 1), /* T302X */
> - CH_DEVICE(0x25, 1, 3), /* T320E */
> - CH_DEVICE(0x26, 1, 2), /* T310X */
> - CH_DEVICE(0x30, 1, 2), /* T3B10 */
> - CH_DEVICE(0x31, 1, 3), /* T3B20 */
> - CH_DEVICE(0x32, 1, 1), /* T3B02 */
> + CH_DEVICE(0x20, 0), /* PE9000 */
> + CH_DEVICE(0x21, 1), /* T302E */
> + CH_DEVICE(0x22, 2), /* T310E */
> + CH_DEVICE(0x23, 3), /* T320X */
> + CH_DEVICE(0x24, 1), /* T302X */
> + CH_DEVICE(0x25, 3), /* T320E */
> + CH_DEVICE(0x26, 2), /* T310X */
> + CH_DEVICE(0x30, 2), /* T3B10 */
> + CH_DEVICE(0x31, 3), /* T3B20 */
> + CH_DEVICE(0x32, 1), /* T3B02 */
> {0,}
> };
>
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-16 21:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-16 19:21 [PATCH 2/9] cxgb3 - Use wild card for PCI vendor ID match Divy Le Ray
2007-11-16 21:25 ` Divy Le Ray
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).