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

Commit 70d9d4b2 authored by Jay Cliburn's avatar Jay Cliburn Committed by Jeff Garzik
Browse files

atl1: remove irq_sem 



Remove unnecessary irq_sem code.

Signed-off-by: default avatarChris Snook <csnook@redhat.com>
Signed-off-by: default avatarJay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d4f01a77

drivers/net/atl1/atl1.h

+0 −1
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ struct atl1_adapter { 
	u16 link_speed;

	u16 link_duplex;

	spinlock_t lock;

	atomic_t irq_sem;

	struct work_struct tx_timeout_task;

	struct work_struct link_chg_task;

	struct work_struct pcie_dma_to_rst_task;

drivers/net/atl1/atl1_main.c

+2 −4
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter) 
	hw->cmb_tx_timer = 1;	/* about 2us */

	hw->smb_timer = 100000;	/* about 200ms */



	atomic_set(&adapter->irq_sem, 0);

	spin_lock_init(&adapter->lock);

	spin_lock_init(&adapter->mb_lock);
@@ -268,8 +267,8 @@ s32 atl1_setup_ring_resources(struct atl1_adapter *adapter) 
 */

static void atl1_irq_enable(struct atl1_adapter *adapter)

{

	if (likely(!atomic_dec_and_test(&adapter->irq_sem)))

	iowrite32(IMR_NORMAL_MASK, adapter->hw.hw_addr + REG_IMR);

	ioread32(adapter->hw.hw_addr + REG_IMR);

}



static void atl1_clear_phy_int(struct atl1_adapter *adapter)
@@ -1195,7 +1194,6 @@ static u32 atl1_configure(struct atl1_adapter *adapter) 
 */

static void atl1_irq_disable(struct atl1_adapter *adapter)

{

	atomic_inc(&adapter->irq_sem);

	iowrite32(0, adapter->hw.hw_addr + REG_IMR);

	ioread32(adapter->hw.hw_addr + REG_IMR);

	synchronize_irq(adapter->pdev->irq);