[PATCH] qlge: Move jiffies_to_usecs immediately before loop

[PATCH] qlge: Move jiffies_to_usecs immediately before loop

[Joe Perches]

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>
---
 drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 25800a1..02b7115 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)

Re: [PATCH] qlge: Move jiffies_to_usecs immediately before loop

[Harish Patil]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1463 bytes --]

>
>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>
>---
> drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
>b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
>index 25800a1..02b7115 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)
>
>
>

Acked-by: Harish Patil <harish.patil@qlogic.com>


Thanks,
Harish

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [PATCH] qlge: Move jiffies_to_usecs immediately before loop

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Tue, 19 May 2015 21:44:52 -0700

> 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>

This looks fine, applied to net-next, thanks Joe.