diff options
author | Joe Perches <joe@perches.com> | 2010-12-21 05:16:09 -0500 |
---|---|---|
committer | Joe Perches <joe@perches.com> | 2010-12-21 05:16:09 -0500 |
commit | 75a84eb5d144dc761e1bb0f7dcacbf2b5cee562c (patch) | |
tree | 53286209c0c3e31ca0a1aabedd39e94ff6cdf816 /drivers/net/tulip | |
parent | 5591c75dc345d93d353d2ab2962824648a73efe4 (diff) |
tulip: Use DEFINE_PCI_DEVICE_TABLE and static const
Moves the PCI table to the right read-only section.
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
Signed-off-by: Joe Perches <joe@perches.com>
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 2c39f2591216..5c01e260f1ba 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -1302,17 +1302,18 @@ static const struct net_device_ops tulip_netdev_ops = { | |||
1302 | #endif | 1302 | #endif |
1303 | }; | 1303 | }; |
1304 | 1304 | ||
1305 | DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = { | ||
1306 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) }, | ||
1307 | { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) }, | ||
1308 | { }, | ||
1309 | }; | ||
1310 | |||
1305 | static int __devinit tulip_init_one (struct pci_dev *pdev, | 1311 | static int __devinit tulip_init_one (struct pci_dev *pdev, |
1306 | const struct pci_device_id *ent) | 1312 | const struct pci_device_id *ent) |
1307 | { | 1313 | { |
1308 | struct tulip_private *tp; | 1314 | struct tulip_private *tp; |
1309 | /* See note below on the multiport cards. */ | 1315 | /* See note below on the multiport cards. */ |
1310 | static unsigned char last_phys_addr[6] = {0x00, 'L', 'i', 'n', 'u', 'x'}; | 1316 | static unsigned char last_phys_addr[6] = {0x00, 'L', 'i', 'n', 'u', 'x'}; |
1311 | static struct pci_device_id early_486_chipsets[] = { | ||
1312 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) }, | ||
1313 | { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) }, | ||
1314 | { }, | ||
1315 | }; | ||
1316 | static int last_irq; | 1317 | static int last_irq; |
1317 | static int multiport_cnt; /* For four-port boards w/one EEPROM */ | 1318 | static int multiport_cnt; /* For four-port boards w/one EEPROM */ |
1318 | int i, irq; | 1319 | int i, irq; |
@@ -1682,7 +1683,9 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1682 | tp->full_duplex_lock = 1; | 1683 | tp->full_duplex_lock = 1; |
1683 | 1684 | ||
1684 | if (tulip_media_cap[tp->default_port] & MediaIsMII) { | 1685 | if (tulip_media_cap[tp->default_port] & MediaIsMII) { |
1685 | u16 media2advert[] = { 0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200 }; | 1686 | static const u16 media2advert[] = { |
1687 | 0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200 | ||
1688 | }; | ||
1686 | tp->mii_advertise = media2advert[tp->default_port - 9]; | 1689 | tp->mii_advertise = media2advert[tp->default_port - 9]; |
1687 | tp->mii_advertise |= (tp->flags & HAS_8023X); /* Matching bits! */ | 1690 | tp->mii_advertise |= (tp->flags & HAS_8023X); /* Matching bits! */ |
1688 | } | 1691 | } |