1 --- a/drivers/net/ethernet/korina.c
2 +++ b/drivers/net/ethernet/korina.c
3 @@ -122,8 +122,6 @@ struct korina_private {
10 spinlock_t lock; /* NIC xmit lock */
12 @@ -890,8 +888,6 @@ static void korina_restart_task(struct w
14 disable_irq(lp->rx_irq);
15 disable_irq(lp->tx_irq);
16 - disable_irq(lp->ovr_irq);
17 - disable_irq(lp->und_irq);
19 writel(readl(&lp->tx_dma_regs->dmasm) |
20 DMA_STAT_FINI | DMA_STAT_ERR,
21 @@ -910,40 +906,10 @@ static void korina_restart_task(struct w
23 korina_multicast_list(dev);
25 - enable_irq(lp->und_irq);
26 - enable_irq(lp->ovr_irq);
27 enable_irq(lp->tx_irq);
28 enable_irq(lp->rx_irq);
31 -static void korina_clear_and_restart(struct net_device *dev, u32 value)
33 - struct korina_private *lp = netdev_priv(dev);
35 - netif_stop_queue(dev);
36 - writel(value, &lp->eth_regs->ethintfc);
37 - schedule_work(&lp->restart_task);
40 -/* Ethernet Tx Underflow interrupt */
41 -static irqreturn_t korina_und_interrupt(int irq, void *dev_id)
43 - struct net_device *dev = dev_id;
44 - struct korina_private *lp = netdev_priv(dev);
47 - spin_lock(&lp->lock);
49 - und = readl(&lp->eth_regs->ethintfc);
51 - if (und & ETH_INT_FC_UND)
52 - korina_clear_and_restart(dev, und & ~ETH_INT_FC_UND);
54 - spin_unlock(&lp->lock);
59 static void korina_tx_timeout(struct net_device *dev)
61 struct korina_private *lp = netdev_priv(dev);
62 @@ -951,25 +917,6 @@ static void korina_tx_timeout(struct net
63 schedule_work(&lp->restart_task);
66 -/* Ethernet Rx Overflow interrupt */
68 -korina_ovr_interrupt(int irq, void *dev_id)
70 - struct net_device *dev = dev_id;
71 - struct korina_private *lp = netdev_priv(dev);
74 - spin_lock(&lp->lock);
75 - ovr = readl(&lp->eth_regs->ethintfc);
77 - if (ovr & ETH_INT_FC_OVR)
78 - korina_clear_and_restart(dev, ovr & ~ETH_INT_FC_OVR);
80 - spin_unlock(&lp->lock);
85 #ifdef CONFIG_NET_POLL_CONTROLLER
86 static void korina_poll_controller(struct net_device *dev)
88 @@ -992,8 +939,7 @@ static int korina_open(struct net_device
91 /* Install the interrupt handler
92 - * that handles the Done Finished
93 - * Ovr and Und Events */
94 + * that handles the Done Finished */
95 ret = request_irq(lp->rx_irq, korina_rx_dma_interrupt,
96 0, "Korina ethernet Rx", dev);
98 @@ -1009,31 +955,10 @@ static int korina_open(struct net_device
102 - /* Install handler for overrun error. */
103 - ret = request_irq(lp->ovr_irq, korina_ovr_interrupt,
104 - 0, "Ethernet Overflow", dev);
106 - printk(KERN_ERR "%s: unable to get OVR IRQ %d\n",
107 - dev->name, lp->ovr_irq);
108 - goto err_free_tx_irq;
111 - /* Install handler for underflow error. */
112 - ret = request_irq(lp->und_irq, korina_und_interrupt,
113 - 0, "Ethernet Underflow", dev);
115 - printk(KERN_ERR "%s: unable to get UND IRQ %d\n",
116 - dev->name, lp->und_irq);
117 - goto err_free_ovr_irq;
119 mod_timer(&lp->media_check_timer, jiffies + 1);
124 - free_irq(lp->ovr_irq, dev);
126 - free_irq(lp->tx_irq, dev);
128 free_irq(lp->rx_irq, dev);
130 @@ -1051,8 +976,6 @@ static int korina_close(struct net_devic
131 /* Disable interrupts */
132 disable_irq(lp->rx_irq);
133 disable_irq(lp->tx_irq);
134 - disable_irq(lp->ovr_irq);
135 - disable_irq(lp->und_irq);
137 korina_abort_tx(dev);
138 tmp = readl(&lp->tx_dma_regs->dmasm);
139 @@ -1072,8 +995,6 @@ static int korina_close(struct net_devic
141 free_irq(lp->rx_irq, dev);
142 free_irq(lp->tx_irq, dev);
143 - free_irq(lp->ovr_irq, dev);
144 - free_irq(lp->und_irq, dev);
148 @@ -1113,8 +1034,6 @@ static int korina_probe(struct platform_
150 lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx");
151 lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx");
152 - lp->ovr_irq = platform_get_irq_byname(pdev, "korina_ovr");
153 - lp->und_irq = platform_get_irq_byname(pdev, "korina_und");
155 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
156 dev->base_addr = r->start;