Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c3d52ef authored by Tony Zelenoff's avatar Tony Zelenoff Committed by David S. Miller
Browse files

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: default avatarTony Zelenoff <antonz@parallels.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0dbab2fb

drivers/net/ethernet/atheros/atlx/atl1.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

		}