aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTony Zelenoff <antonz@parallels.com>2012-04-13 02:09:49 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-15 12:56:01 -0400
commit5c3d52ef5a043b17175b50c9b8a7a043dd763662 (patch)
treec3271a9c4daa242133ac4455ad84f89c5b48ad92 /drivers
parent0dbab2fb1dbb2ca749a0787c784528892ecb76d4 (diff)
atl1: use defined functions to disable irq
Looks like direct writes to IMR register is not good idea, because there are exist functions to make this work. Signed-off-by: Tony Zelenoff <antonz@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/atheros/atlx/atl1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index d57422e31388..93c92291da9c 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -266,7 +266,7 @@ static s32 atl1_reset_hw(struct atl1_hw *hw)
266 * interrupts & Clear any pending interrupt events 266 * interrupts & Clear any pending interrupt events
267 */ 267 */
268 /* 268 /*
269 * iowrite32(0, hw->hw_addr + REG_IMR); 269 * atlx_irq_disable(adapter);
270 * iowrite32(0xffffffff, hw->hw_addr + REG_ISR); 270 * iowrite32(0xffffffff, hw->hw_addr + REG_ISR);
271 */ 271 */
272 272
@@ -2512,7 +2512,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
2512 dev_printk(KERN_DEBUG, &adapter->pdev->dev, 2512 dev_printk(KERN_DEBUG, &adapter->pdev->dev,
2513 "pcie phy link down %x\n", status); 2513 "pcie phy link down %x\n", status);
2514 if (netif_running(adapter->netdev)) { /* reset MAC */ 2514 if (netif_running(adapter->netdev)) { /* reset MAC */
2515 iowrite32(0, adapter->hw.hw_addr + REG_IMR); 2515 atlx_irq_disable(adapter);
2516 schedule_work(&adapter->pcie_dma_to_rst_task); 2516 schedule_work(&adapter->pcie_dma_to_rst_task);
2517 return IRQ_HANDLED; 2517 return IRQ_HANDLED;
2518 } 2518 }
@@ -2524,7 +2524,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
2524 dev_printk(KERN_DEBUG, &adapter->pdev->dev, 2524 dev_printk(KERN_DEBUG, &adapter->pdev->dev,
2525 "pcie DMA r/w error (status = 0x%x)\n", 2525 "pcie DMA r/w error (status = 0x%x)\n",
2526 status); 2526 status);
2527 iowrite32(0, adapter->hw.hw_addr + REG_IMR); 2527 atlx_irq_disable(adapter);
2528 schedule_work(&adapter->pcie_dma_to_rst_task); 2528 schedule_work(&adapter->pcie_dma_to_rst_task);
2529 return IRQ_HANDLED; 2529 return IRQ_HANDLED;
2530 } 2530 }