|
@@ -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 @@ err_nomem:
|
|
|
*/
|
|
|
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)
|
|
@@ -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);
|