Title: [6511] trunk/drivers/net/bfin_mac.c: revert IRQF_SHARED support as upstream accepted it and use comments sent upstream
- Revision
- 6511
- Author
- vapier
- Date
- 2009-05-31 02:32:50 -0500 (Sun, 31 May 2009)
Log Message
revert IRQF_SHARED support as upstream accepted it and use comments sent upstream
Modified Paths
Diff
Modified: trunk/drivers/net/bfin_mac.c (6510 => 6511)
--- trunk/drivers/net/bfin_mac.c 2009-05-31 03:00:44 UTC (rev 6510)
+++ trunk/drivers/net/bfin_mac.c 2009-05-31 07:32:50 UTC (rev 6511)
@@ -641,9 +641,9 @@
(u32)(current_tx_ptr->packet + skb->len + 2));
}
- /* Make sure the internal data buffer in the core are drained
+ /* make sure the internal data buffers in the core are drained
* so that the DMA descriptors are completely written when the
- * the DMA engins goes to fetch them bellow.
+ * DMA engine goes to fetch them below
*/
SSYNC();
@@ -723,9 +723,6 @@
struct net_device *dev = dev_id;
int number = 0;
- if (!(bfin_read_DMA1_IRQ_STATUS() & (DMA_DONE | DMA_ERR)))
- return IRQ_NONE;
-
get_one_packet:
if (current_rx_ptr->status.status_word == 0) {
/* no more new packet received */
@@ -735,7 +732,8 @@
goto real_rx;
}
}
- bfin_write_DMA1_IRQ_STATUS(DMA_DONE | DMA_ERR);
+ bfin_write_DMA1_IRQ_STATUS(bfin_read_DMA1_IRQ_STATUS() |
+ DMA_DONE | DMA_ERR);
return IRQ_HANDLED;
}
@@ -1046,7 +1044,7 @@
/* now, enable interrupts */
/* register irq handler */
rc = request_irq(IRQ_MAC_RX, bfin_mac_interrupt,
- IRQF_DISABLED | IRQF_SHARED, "EMAC_RX", ndev);
+ IRQF_DISABLED, "EMAC_RX", ndev);
if (rc) {
dev_err(&pdev->dev, "Cannot request Blackfin MAC RX IRQ!\n");
rc = -EBUSY;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
