diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/net/sunqe.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/net/sunqe.c')
| -rw-r--r-- | drivers/net/sunqe.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index b1b19a3c8..83b95a72a 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c @@ -263,7 +263,7 @@ static int qe_init(struct sunqe *qep, int from_irq) /* Wait a little bit for the link to come up... */ if(!(mregs->phyconfig & MREGS_PHYCONFIG_LTESTDIS)) { - udelay(5000); + mdelay(5); if(!(mregs->phyconfig & MREGS_PHYCONFIG_LSTAT)) printk("%s: Warning, link state is down.\n", qep->dev->name); } @@ -1103,7 +1103,7 @@ static inline int qec_ether_init(struct device *dev, struct linux_sbus_device *s qe_devs[i]->hard_start_xmit = qe_start_xmit; qe_devs[i]->get_stats = qe_get_stats; qe_devs[i]->set_multicast_list = qe_set_multicast; - qe_devs[i]->irq = (unsigned char) sdev->irqs[0].pri; + qe_devs[i]->irq = sdev->irqs[0]; qe_devs[i]->dma = 0; ether_setup(qe_devs[i]); } @@ -1114,32 +1114,14 @@ static inline int qec_ether_init(struct device *dev, struct linux_sbus_device *s * for it now. */ if(sparc_cpu_model == sun4c) { - if(request_irq(sdev->irqs[0].pri, &sun4c_qec_interrupt, + if(request_irq(sdev->irqs[0], &sun4c_qec_interrupt, SA_SHIRQ, "QuadEther", (void *) qecp)) { printk("QuadEther: Can't register QEC master irq handler.\n"); res = EAGAIN; goto qec_free_devs; } - } -#ifdef __sparc_v9__ - else if(sparc_cpu_model == sun4u) { - struct devid_cookie dcookie; - - dcookie.real_dev_id = qecp; - dcookie.imap = dcookie.iclr = 0; - dcookie.pil = -1; - dcookie.bus_cookie = sdev->my_bus; - if(request_irq(sdev->irqs[0].pri, &qec_interrupt, - (SA_SHIRQ | SA_SBUS | SA_DCOOKIE), - "QuadEther", &dcookie)) { - printk("QuadEther: Can't register QEC master irq handler.\n"); - res = EAGAIN; - goto qec_free_devs; - } - } -#endif - else { - if(request_irq(sdev->irqs[0].pri, &qec_interrupt, + } else { + if(request_irq(sdev->irqs[0], &qec_interrupt, SA_SHIRQ, "QuadEther", (void *) qecp)) { printk("QuadEther: Can't register QEC master irq handler.\n"); res = EAGAIN; @@ -1241,7 +1223,7 @@ cleanup_module(void) unregister_netdev(root_qec_dev->qes[i]->dev); kfree(root_qec_dev->qes[i]); } - free_irq(root_qec_dev->qec_sbus_dev->irqs[0].pri, (void *)root_qec_dev); + free_irq(root_qec_dev->qec_sbus_dev->irqs[0], (void *)root_qec_dev); kfree(root_qec_dev); root_qec_dev = next_qec; } |