aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sun3_82586.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sun3_82586.c')
-rw-r--r--drivers/net/sun3_82586.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c
index d5a58fb30d3a..0605461bc56d 100644
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/sun3_82586.c
@@ -14,10 +14,10 @@
14 * Alphacode 0.82 (96/09/29) for Linux 2.0.0 (or later) 14 * Alphacode 0.82 (96/09/29) for Linux 2.0.0 (or later)
15 * Copyrights (c) 1994,1995,1996 by M.Hipp (hippm@informatik.uni-tuebingen.de) 15 * Copyrights (c) 1994,1995,1996 by M.Hipp (hippm@informatik.uni-tuebingen.de)
16 * -------------------------- 16 * --------------------------
17 * 17 *
18 * Consult ni52.c for further notes from the original driver. 18 * Consult ni52.c for further notes from the original driver.
19 * 19 *
20 * This incarnation currently supports the OBIO version of the i82586 chip 20 * This incarnation currently supports the OBIO version of the i82586 chip
21 * used in certain sun3 models. It should be fairly doable to expand this 21 * used in certain sun3 models. It should be fairly doable to expand this
22 * to support VME if I should every acquire such a board. 22 * to support VME if I should every acquire such a board.
23 * 23 *
@@ -227,7 +227,7 @@ static int check586(struct net_device *dev,char *where,unsigned size)
227 return 0; 227 return 0;
228 228
229 iscp_addr = (char *)dvma_btov((unsigned long)where); 229 iscp_addr = (char *)dvma_btov((unsigned long)where);
230 230
231 p->iscp = (struct iscp_struct *) iscp_addr; 231 p->iscp = (struct iscp_struct *) iscp_addr;
232 memset((char *)p->iscp,0, sizeof(struct iscp_struct)); 232 memset((char *)p->iscp,0, sizeof(struct iscp_struct));
233 233
@@ -237,7 +237,7 @@ static int check586(struct net_device *dev,char *where,unsigned size)
237 sun3_reset586(); 237 sun3_reset586();
238 sun3_attn586(); 238 sun3_attn586();
239 DELAY(1); /* wait a while... */ 239 DELAY(1); /* wait a while... */
240 240
241 if(p->iscp->busy) /* i82586 clears 'busy' after successful init */ 241 if(p->iscp->busy) /* i82586 clears 'busy' after successful init */
242 return 0; 242 return 0;
243 243
@@ -286,7 +286,7 @@ struct net_device * __init sun3_82586_probe(int unit)
286 unsigned long ioaddr; 286 unsigned long ioaddr;
287 static int found = 0; 287 static int found = 0;
288 int err = -ENOMEM; 288 int err = -ENOMEM;
289 289
290 /* check that this machine has an onboard 82586 */ 290 /* check that this machine has an onboard 82586 */
291 switch(idprom->id_machtype) { 291 switch(idprom->id_machtype) {
292 case SM_SUN3|SM_3_160: 292 case SM_SUN3|SM_3_160:
@@ -300,12 +300,12 @@ struct net_device * __init sun3_82586_probe(int unit)
300 300
301 if (found) 301 if (found)
302 return ERR_PTR(-ENODEV); 302 return ERR_PTR(-ENODEV);
303 303
304 ioaddr = (unsigned long)ioremap(IE_OBIO, SUN3_82586_TOTAL_SIZE); 304 ioaddr = (unsigned long)ioremap(IE_OBIO, SUN3_82586_TOTAL_SIZE);
305 if (!ioaddr) 305 if (!ioaddr)
306 return ERR_PTR(-ENOMEM); 306 return ERR_PTR(-ENOMEM);
307 found = 1; 307 found = 1;
308 308
309 dev = alloc_etherdev(sizeof(struct priv)); 309 dev = alloc_etherdev(sizeof(struct priv));
310 if (!dev) 310 if (!dev)
311 goto out; 311 goto out;
@@ -379,7 +379,7 @@ static int __init sun3_82586_probe1(struct net_device *dev,int ioaddr)
379 ((struct priv *) dev->priv)->num_recv_buffs = NUM_RECV_BUFFS_32; 379 ((struct priv *) dev->priv)->num_recv_buffs = NUM_RECV_BUFFS_32;
380 380
381 printk("Memaddr: 0x%lx, Memsize: %d, IRQ %d\n",dev->mem_start,size, dev->irq); 381 printk("Memaddr: 0x%lx, Memsize: %d, IRQ %d\n",dev->mem_start,size, dev->irq);
382 382
383 dev->open = sun3_82586_open; 383 dev->open = sun3_82586_open;
384 dev->stop = sun3_82586_close; 384 dev->stop = sun3_82586_close;
385 dev->get_stats = sun3_82586_get_stats; 385 dev->get_stats = sun3_82586_get_stats;
@@ -479,7 +479,7 @@ static int init586(struct net_device *dev)
479 /* 479 /*
480 * TDR, wire check .. e.g. no resistor e.t.c 480 * TDR, wire check .. e.g. no resistor e.t.c
481 */ 481 */
482 482
483 tdr_cmd = (struct tdr_cmd_struct *)ptr; 483 tdr_cmd = (struct tdr_cmd_struct *)ptr;
484 484
485 tdr_cmd->cmd_status = 0; 485 tdr_cmd->cmd_status = 0;