diff options
Diffstat (limited to 'drivers/net/fealnx.c')
-rw-r--r-- | drivers/net/fealnx.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 0e6a495549fa..aaf136658765 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -124,7 +124,9 @@ MODULE_PARM_DESC(multicast_filter_limit, "fealnx maximum number of filtered mult | |||
124 | MODULE_PARM_DESC(options, "fealnx: Bits 0-3: media type, bit 17: full duplex"); | 124 | MODULE_PARM_DESC(options, "fealnx: Bits 0-3: media type, bit 17: full duplex"); |
125 | MODULE_PARM_DESC(full_duplex, "fealnx full duplex setting(s) (1)"); | 125 | MODULE_PARM_DESC(full_duplex, "fealnx full duplex setting(s) (1)"); |
126 | 126 | ||
127 | #define MIN_REGION_SIZE 136 | 127 | enum { |
128 | MIN_REGION_SIZE = 136, | ||
129 | }; | ||
128 | 130 | ||
129 | /* A chip capabilities table, matching the entries in pci_tbl[] above. */ | 131 | /* A chip capabilities table, matching the entries in pci_tbl[] above. */ |
130 | enum chip_capability_flags { | 132 | enum chip_capability_flags { |
@@ -149,7 +151,7 @@ struct chip_info { | |||
149 | int flags; | 151 | int flags; |
150 | }; | 152 | }; |
151 | 153 | ||
152 | static const struct chip_info skel_netdrv_tbl[] = { | 154 | static const struct chip_info skel_netdrv_tbl[] __devinitdata = { |
153 | { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR }, | 155 | { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR }, |
154 | { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR }, | 156 | { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR }, |
155 | { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR }, | 157 | { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR }, |
@@ -503,13 +505,14 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
503 | 505 | ||
504 | len = pci_resource_len(pdev, bar); | 506 | len = pci_resource_len(pdev, bar); |
505 | if (len < MIN_REGION_SIZE) { | 507 | if (len < MIN_REGION_SIZE) { |
506 | printk(KERN_ERR "%s: region size %ld too small, aborting\n", | 508 | dev_printk(KERN_ERR, &pdev->dev, |
507 | boardname, len); | 509 | "region size %ld too small, aborting\n", len); |
508 | return -ENODEV; | 510 | return -ENODEV; |
509 | } | 511 | } |
510 | 512 | ||
511 | i = pci_request_regions(pdev, boardname); | 513 | i = pci_request_regions(pdev, boardname); |
512 | if (i) return i; | 514 | if (i) |
515 | return i; | ||
513 | 516 | ||
514 | irq = pdev->irq; | 517 | irq = pdev->irq; |
515 | 518 | ||