diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2011-12-02 13:23:56 -0500 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2011-12-06 17:07:54 -0500 |
commit | 547c474fa7dffeff312a8568d243f5f1fe84938c (patch) | |
tree | 42acc6d6caba8772603ef6458d84ac265e4f9456 /drivers/net/ethernet/sfc | |
parent | 8431a27ad5af8e52b4cd2d9e15c2a23670845b18 (diff) |
sfc: Remove device ID macros only used once
The SFC9020/SFL9021 device IDs are only used in the device ID table,
where we can just as well use comments.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc')
-rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/efx.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 14e134d3b4d7..9cf3eab11835 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c | |||
@@ -2235,9 +2235,9 @@ static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = { | |||
2235 | {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, | 2235 | {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, |
2236 | PCI_DEVICE_ID_SOLARFLARE_SFC4000B), | 2236 | PCI_DEVICE_ID_SOLARFLARE_SFC4000B), |
2237 | .driver_data = (unsigned long) &falcon_b0_nic_type}, | 2237 | .driver_data = (unsigned long) &falcon_b0_nic_type}, |
2238 | {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID), | 2238 | {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803), /* SFC9020 */ |
2239 | .driver_data = (unsigned long) &siena_a0_nic_type}, | 2239 | .driver_data = (unsigned long) &siena_a0_nic_type}, |
2240 | {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID), | 2240 | {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813), /* SFL9021 */ |
2241 | .driver_data = (unsigned long) &siena_a0_nic_type}, | 2241 | .driver_data = (unsigned long) &siena_a0_nic_type}, |
2242 | {0} /* end of list */ | 2242 | {0} /* end of list */ |
2243 | }; | 2243 | }; |
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h index 4764793ed234..8a5336d86a12 100644 --- a/drivers/net/ethernet/sfc/efx.h +++ b/drivers/net/ethernet/sfc/efx.h | |||
@@ -14,10 +14,6 @@ | |||
14 | #include "net_driver.h" | 14 | #include "net_driver.h" |
15 | #include "filter.h" | 15 | #include "filter.h" |
16 | 16 | ||
17 | /* PCI IDs */ | ||
18 | #define BETHPAGE_A_P_DEVID 0x0803 | ||
19 | #define SIENA_A_P_DEVID 0x0813 | ||
20 | |||
21 | /* Solarstorm controllers use BAR 0 for I/O space and BAR 2(&3) for memory */ | 17 | /* Solarstorm controllers use BAR 0 for I/O space and BAR 2(&3) for memory */ |
22 | #define EFX_MEM_BAR 2 | 18 | #define EFX_MEM_BAR 2 |
23 | 19 | ||