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

Commit 9d1dfc06 authored by Santosh Nayak's avatar Santosh Nayak Committed by David S. Miller
Browse files

qla3xxx: ethernet: Fix bogus interrupt state flag. 



In 'ql_adapter_initialize'
the first call for 'spin_unlock_irqrestore()' is with hw_flags = 0,
which is as good as 'spin_unlock_irq()' (unconditional interrupt
enabling). If this is intended, then for better performance
'spin_unlock_irqrestore()' can be replaced with 'spin_unlock_irq()'
and 'spin_lock_irqsave()' can be replaced by 'spin_lock_irq()

Signed-off-by: default avatarSantosh Nayak <santoshprasadnayak@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1d81d4c

drivers/net/ethernet/qlogic/qla3xxx.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -3017,7 +3017,6 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev) 
		(void __iomem *)port_regs;

		(void __iomem *)port_regs;

	u32 delay = 10;

	u32 delay = 10;

	int status = 0;

	int status = 0;

	unsigned long hw_flags = 0;





	if (ql_mii_setup(qdev))

	if (ql_mii_setup(qdev))

		return -1;

		return -1;
@@ -3228,9 +3227,9 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev) 
		value = ql_read_page0_reg(qdev, &port_regs->portStatus);

		value = ql_read_page0_reg(qdev, &port_regs->portStatus);

		if (value & PORT_STATUS_IC)

		if (value & PORT_STATUS_IC)

			break;

			break;

		spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);

		spin_unlock_irq(&qdev->hw_lock);

		msleep(500);

		msleep(500);

		spin_lock_irqsave(&qdev->hw_lock, hw_flags);

		spin_lock_irq(&qdev->hw_lock);

	} while (--delay);

	} while (--delay);





	if (delay == 0) {

	if (delay == 0) {