aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-27 09:12:38 -0400
committerJeff Garzik <jeff@garzik.org>2006-07-05 13:40:50 -0400
commit46009c8bcd5d7c9fcbfc17d0455a471bea5be4d4 (patch)
treec9ab3cd5bf6ed74bf91a9644b566fc4ea7ff710e
parent8ab6f3f706f5cb91bc0793afc95c8809837ece05 (diff)
[netdrvr] minor cleanups in Becker-derived drivers
- fealnx: convert #define to enum - fealnx, sundance: mark chip info table __devinitdata - fealnx: use dev_printk() during probe - fealnx: formatting cleanups - starfire: remove obsolete comment - sundance, via-rhine: add some whitespace where useful, in tables - sundance: prefer "{ }" table terminator - via-rhine: mark PCI probe table const Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/fealnx.c13
-rw-r--r--drivers/net/starfire.c1
-rw-r--r--drivers/net/sundance.c22
-rw-r--r--drivers/net/via-rhine.c11
4 files changed, 24 insertions, 23 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
124MODULE_PARM_DESC(options, "fealnx: Bits 0-3: media type, bit 17: full duplex"); 124MODULE_PARM_DESC(options, "fealnx: Bits 0-3: media type, bit 17: full duplex");
125MODULE_PARM_DESC(full_duplex, "fealnx full duplex setting(s) (1)"); 125MODULE_PARM_DESC(full_duplex, "fealnx full duplex setting(s) (1)");
126 126
127#define MIN_REGION_SIZE 136 127enum {
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. */
130enum chip_capability_flags { 132enum chip_capability_flags {
@@ -149,7 +151,7 @@ struct chip_info {
149 int flags; 151 int flags;
150}; 152};
151 153
152static const struct chip_info skel_netdrv_tbl[] = { 154static 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
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 24d55b4591b3..c0a62b00ffc8 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -730,7 +730,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
730 goto err_out_free_netdev; 730 goto err_out_free_netdev;
731 } 731 }
732 732
733 /* ioremap is borken in Linux-2.2.x/sparc64 */
734 base = ioremap(ioaddr, io_size); 733 base = ioremap(ioaddr, io_size);
735 if (!base) { 734 if (!base) {
736 printk(KERN_ERR DRV_NAME " %d: cannot remap %#x @ %#lx, aborting\n", 735 printk(KERN_ERR DRV_NAME " %d: cannot remap %#x @ %#lx, aborting\n",
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index de6645196657..ac17377b3e9f 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -204,15 +204,15 @@ IVc. Errata
204#define USE_IO_OPS 1 204#define USE_IO_OPS 1
205#endif 205#endif
206 206
207static struct pci_device_id sundance_pci_tbl[] = { 207static const struct pci_device_id sundance_pci_tbl[] = {
208 {0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0}, 208 { 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 },
209 {0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1}, 209 { 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 },
210 {0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2}, 210 { 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 },
211 {0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3}, 211 { 0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3 },
212 {0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4}, 212 { 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
213 {0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5}, 213 { 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
214 {0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6}, 214 { 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
215 {0,} 215 { }
216}; 216};
217MODULE_DEVICE_TABLE(pci, sundance_pci_tbl); 217MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
218 218
@@ -223,7 +223,7 @@ enum {
223struct pci_id_info { 223struct pci_id_info {
224 const char *name; 224 const char *name;
225}; 225};
226static const struct pci_id_info pci_id_tbl[] = { 226static const struct pci_id_info pci_id_tbl[] __devinitdata = {
227 {"D-Link DFE-550TX FAST Ethernet Adapter"}, 227 {"D-Link DFE-550TX FAST Ethernet Adapter"},
228 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"}, 228 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
229 {"D-Link DFE-580TX 4 port Server Adapter"}, 229 {"D-Link DFE-580TX 4 port Server Adapter"},
@@ -231,7 +231,7 @@ static const struct pci_id_info pci_id_tbl[] = {
231 {"D-Link DL10050-based FAST Ethernet Adapter"}, 231 {"D-Link DL10050-based FAST Ethernet Adapter"},
232 {"Sundance Technology Alta"}, 232 {"Sundance Technology Alta"},
233 {"IC Plus Corporation IP100A FAST Ethernet Adapter"}, 233 {"IC Plus Corporation IP100A FAST Ethernet Adapter"},
234 {NULL,}, /* 0 terminated list. */ 234 { } /* terminate list. */
235}; 235};
236 236
237/* This driver was written to use PCI memory space, however x86-oriented 237/* This driver was written to use PCI memory space, however x86-oriented
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index e48e76ce73a0..d3d0ec970318 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -252,12 +252,11 @@ enum rhine_quirks {
252/* Beware of PCI posted writes */ 252/* Beware of PCI posted writes */
253#define IOSYNC do { ioread8(ioaddr + StationAddr); } while (0) 253#define IOSYNC do { ioread8(ioaddr + StationAddr); } while (0)
254 254
255static struct pci_device_id rhine_pci_tbl[] = 255static const struct pci_device_id rhine_pci_tbl[] = {
256{ 256 { 0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, }, /* VT86C100A */
257 {0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT86C100A */ 257 { 0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, }, /* VT6102 */
258 {0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6102 */ 258 { 0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, }, /* 6105{,L,LOM} */
259 {0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* 6105{,L,LOM} */ 259 { 0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, }, /* VT6105M */
260 {0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6105M */
261 { } /* terminate list */ 260 { } /* terminate list */
262}; 261};
263MODULE_DEVICE_TABLE(pci, rhine_pci_tbl); 262MODULE_DEVICE_TABLE(pci, rhine_pci_tbl);