diff options
| author | Joe Perches <joe@perches.com> | 2015-05-19 21:44:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-21 17:23:18 -0400 |
| commit | 3f6e785fe113febd037af6351fc375eb428ff65b (patch) | |
| tree | 265fb99b3807c63628fa994ce484031c6d2e7e8b /drivers/net/ethernet/qlogic/qlge/qlge_main.c | |
| parent | 4ac2dc8928d186f93572398b3897c59e9eb591e5 (diff) | |
| download | blackbird-op-linux-3f6e785fe113febd037af6351fc375eb428ff65b.tar.gz blackbird-op-linux-3f6e785fe113febd037af6351fc375eb428ff65b.zip | |
qlge: Move jiffies_to_usecs immediately before loop
30 usecs (or really, 1 jiffy) can go by pretty fast.
Move the set of the timeout immediately before the loop.
Remove the unnecessary max(1ul, usecs_to_jiffies(30)) as
usecs_to_jiffies with a non-zero constant is guaranteed
to be non-zero.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlge/qlge_main.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index 25800a1dedcb..02b7115b6aaa 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -3871,9 +3871,6 @@ static int ql_adapter_reset(struct ql_adapter *qdev) return status; } - end_jiffies = jiffies + - max((unsigned long)1, usecs_to_jiffies(30)); - /* Check if bit is set then skip the mailbox command and * clear the bit, else we are in normal reset process. */ @@ -3888,6 +3885,7 @@ static int ql_adapter_reset(struct ql_adapter *qdev) ql_write32(qdev, RST_FO, (RST_FO_FR << 16) | RST_FO_FR); + end_jiffies = jiffies + usecs_to_jiffies(30); do { value = ql_read32(qdev, RST_FO); if ((value & RST_FO_FR) == 0) |
