adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-04 07:03:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

atl1: remove irq_sem

Browse source 
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>
This commit is contained in:
Jay Cliburn 2007-07-15 11:03:25 -05:00 committed by Jeff Garzik
parent d4f01a77d7
commit 70d9d4b247
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/atl1/atl1.h
View file

@ -236,7 +236,6 @@ struct atl1_adapter {
u16 link_speed; u16 link_speed;
u16 link_duplex; u16 link_duplex;
spinlock_t lock; spinlock_t lock;
atomic_t irq_sem;
struct work_struct tx_timeout_task; struct work_struct tx_timeout_task;
struct work_struct link_chg_task; struct work_struct link_chg_task;
struct work_struct pcie_dma_to_rst_task; struct work_struct pcie_dma_to_rst_task;

6
drivers/net/atl1/atl1_main.c
View file

@ -162,7 +162,6 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
hw->cmb_tx_timer = 1; /* about 2us */ hw->cmb_tx_timer = 1; /* about 2us */
hw->smb_timer = 100000; /* about 200ms */ hw->smb_timer = 100000; /* about 200ms */
atomic_set(&adapter->irq_sem, 0);
spin_lock_init(&adapter->lock); spin_lock_init(&adapter->lock);
spin_lock_init(&adapter->mb_lock); spin_lock_init(&adapter->mb_lock);
@ -268,8 +267,8 @@ err_nomem:
*/ */
static void atl1_irq_enable(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) 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) static void atl1_irq_disable(struct atl1_adapter *adapter)
{ {
atomic_inc(&adapter->irq_sem);
iowrite32(0, adapter->hw.hw_addr + REG_IMR); iowrite32(0, adapter->hw.hw_addr + REG_IMR);
ioread32(adapter->hw.hw_addr + REG_IMR); ioread32(adapter->hw.hw_addr + REG_IMR);
synchronize_irq(adapter->pdev->irq); synchronize_irq(adapter->pdev->irq);