evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

atl1: use defined functions to disable irq

Browse source 
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>
This commit is contained in:
Tony Zelenoff 2012-04-13 06:09:49 +00:00 • committed by David S. Miller
parent 0dbab2fb1d
commit 5c3d52ef5a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/atheros/atlx/atl1.c
View file

@ -266,7 +266,7 @@ static s32 atl1_reset_hw(struct atl1_hw *hw)
* interrupts & Clear any pending interrupt events * interrupts & Clear any pending interrupt events
*/ */
/* /*
* iowrite32(0, hw->hw_addr + REG_IMR); * atlx_irq_disable(adapter);
* iowrite32(0xffffffff, hw->hw_addr + REG_ISR); * 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, dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"pcie phy link down %x\n", status); "pcie phy link down %x\n", status);
if (netif_running(adapter->netdev)) { /* reset MAC */ 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); schedule_work(&adapter->pcie_dma_to_rst_task);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -2524,7 +2524,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
dev_printk(KERN_DEBUG, &adapter->pdev->dev, dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"pcie DMA r/w error (status = 0x%x)\n", "pcie DMA r/w error (status = 0x%x)\n",
status); status);
iowrite32(0, adapter->hw.hw_addr + REG_IMR); atlx_irq_disable(adapter);
schedule_work(&adapter->pcie_dma_to_rst_task); schedule_work(&adapter->pcie_dma_to_rst_task);
return IRQ_HANDLED; return IRQ_HANDLED;
} }