diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-06-27 12:54:34 (GMT) |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-05 17:40:49 (GMT) |
commit | c3d8e682b7d10f57d13c86ecbb15806781d6e953 (patch) | |
tree | b3c20aaf5679ad22a91d14de16615f0d31e3e19d /drivers/net/yellowfin.c | |
parent | 03a8c6611aa18f919f8700b18f925e9008b616a8 (diff) | |
download | linux-fsl-qoriq-c3d8e682b7d10f57d13c86ecbb15806781d6e953.tar.xz |
[netdrvr] Remove Becker-template 'io_size' member, when invariant
Becker-derived drivers often have the 'io_size' member in their chip
info struct, indicating the minimum required size of the I/O resource
(usually a PCI BAR). For many situations, this number is either
constant or irrelevant (due to pci_iomap convenience behavior).
This change removes the io_size invariant member, and replaces it with a
compile-time constant.
Drivers updated: fealnx, gt96100eth, winbond-840, yellowfin
Additionally,
- gt96100eth: unused 'drv_flags' removed from gt96100eth
- winbond-840: unused struct match_info removed
- winbond-840: mark pci_id_tbl[] const, __devinitdata
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/yellowfin.c')
-rw-r--r-- | drivers/net/yellowfin.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 207340f..8459a18 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c @@ -215,8 +215,11 @@ enum capability_flags { HasMACAddrBug=32, /* Only on early revs. */ DontUseEeprom=64, /* Don't read the MAC from the EEPROm. */ }; + /* The PCI I/O space extent. */ -#define YELLOWFIN_SIZE 0x100 +enum { + YELLOWFIN_SIZE = 0x100, +}; struct pci_id_info { const char *name; @@ -224,16 +227,14 @@ struct pci_id_info { int pci, pci_mask, subsystem, subsystem_mask; int revision, revision_mask; /* Only 8 bits. */ } id; - int io_size; /* Needed for I/O region check or ioremap(). */ int drv_flags; /* Driver use, intended as capability flags. */ }; static const struct pci_id_info pci_id_tbl[] = { {"Yellowfin G-NIC Gigabit Ethernet", { 0x07021000, 0xffffffff}, - YELLOWFIN_SIZE, FullTxStatus | IsGigabit | HasMulticastBug | HasMACAddrBug | DontUseEeprom}, {"Symbios SYM83C885", { 0x07011000, 0xffffffff}, - YELLOWFIN_SIZE, HasMII | DontUseEeprom }, + HasMII | DontUseEeprom }, { } }; |