From 5c3d52ef5a043b17175b50c9b8a7a043dd763662 Mon Sep 17 00:00:00 2001
From: Tony Zelenoff <antonz@parallels.com>
Date: Fri, 13 Apr 2012 06:09:49 +0000
Subject: [PATCH] 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>
---
drivers/net/ethernet/atheros/atlx/atl1.c | 6 +++---
1 file 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)
* interrupts & Clear any pending interrupt events
*/
/*
- * iowrite32(0, hw->hw_addr + REG_IMR);
+ * atlx_irq_disable(adapter);
* iowrite32(0xffffffff, hw->hw_addr + REG_ISR);
*/
@@ -2512,7 +2512,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"pcie phy link down %x\n", status);
if (netif_running(adapter->netdev)) { /* reset MAC */
- iowrite32(0, adapter->hw.hw_addr + REG_IMR);
+ atlx_irq_disable(adapter);
schedule_work(&adapter->pcie_dma_to_rst_task);
return IRQ_HANDLED;
}
@@ -2524,7 +2524,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"pcie DMA r/w error (status = 0x%x)\n",
status);
- iowrite32(0, adapter->hw.hw_addr + REG_IMR);
+ atlx_irq_disable(adapter);
schedule_work(&adapter->pcie_dma_to_rst_task);
return IRQ_HANDLED;
}
--
2.34.1