Skip to content

Commit

Permalink
atl1: remove irq_sem
Browse files Browse the repository at this point in the history
Remove unnecessary irq_sem code.

Signed-off-by: Chris Snook <csnook@redhat.com>
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Jay Cliburn authored and Jeff Garzik committed Jul 16, 2007
1 parent d4f01a7 commit 70d9d4b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion drivers/net/atl1/atl1.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/atl1/atl1_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 70d9d4b

Please sign in to comment.