* [PATCH] phylib: Fix delay argument of schedule_delayed_work
@ 2009-04-15 16:05 Atsushi Nemoto
2009-04-15 18:37 ` Marcin Slusarz
2009-04-16 9:43 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Atsushi Nemoto @ 2009-04-15 16:05 UTC (permalink / raw)
To: Marcin Slusarz; +Cc: David S. Miller, netdev, linux-kernel
The commit a390d1f3 ("phylib: convert state_queue work to
delayed_work") missed converting 'expires' value to 'delay' value.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
drivers/net/phy/phy.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 3ff1f42..5737b85 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -434,7 +434,7 @@ void phy_start_machine(struct phy_device *phydev,
phydev->adjust_state = handler;
INIT_DELAYED_WORK(&phydev->state_queue, phy_state_machine);
- schedule_delayed_work(&phydev->state_queue, jiffies + HZ);
+ schedule_delayed_work(&phydev->state_queue, HZ);
}
/**
@@ -937,6 +937,5 @@ static void phy_state_machine(struct work_struct *work)
if (err < 0)
phy_error(phydev);
- schedule_delayed_work(&phydev->state_queue,
- jiffies + PHY_STATE_TIME * HZ);
+ schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ);
}
--
1.5.6.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] phylib: Fix delay argument of schedule_delayed_work
2009-04-15 16:05 [PATCH] phylib: Fix delay argument of schedule_delayed_work Atsushi Nemoto
@ 2009-04-15 18:37 ` Marcin Slusarz
2009-04-16 9:43 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Marcin Slusarz @ 2009-04-15 18:37 UTC (permalink / raw)
To: Atsushi Nemoto; +Cc: David S. Miller, netdev, linux-kernel
Atsushi Nemoto wrote:
> The commit a390d1f3 ("phylib: convert state_queue work to
> delayed_work") missed converting 'expires' value to 'delay' value.
Yeah, sorry about that.
>
> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: Marcin Slusarz <marcin.slusarz@gmail.com>
> ---
> drivers/net/phy/phy.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 3ff1f42..5737b85 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -434,7 +434,7 @@ void phy_start_machine(struct phy_device *phydev,
> phydev->adjust_state = handler;
>
> INIT_DELAYED_WORK(&phydev->state_queue, phy_state_machine);
> - schedule_delayed_work(&phydev->state_queue, jiffies + HZ);
> + schedule_delayed_work(&phydev->state_queue, HZ);
> }
>
> /**
> @@ -937,6 +937,5 @@ static void phy_state_machine(struct work_struct *work)
> if (err < 0)
> phy_error(phydev);
>
> - schedule_delayed_work(&phydev->state_queue,
> - jiffies + PHY_STATE_TIME * HZ);
> + schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ);
> }
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] phylib: Fix delay argument of schedule_delayed_work
2009-04-15 16:05 [PATCH] phylib: Fix delay argument of schedule_delayed_work Atsushi Nemoto
2009-04-15 18:37 ` Marcin Slusarz
@ 2009-04-16 9:43 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2009-04-16 9:43 UTC (permalink / raw)
To: anemo; +Cc: marcin.slusarz, netdev, linux-kernel
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Thu, 16 Apr 2009 01:05:51 +0900
> The commit a390d1f3 ("phylib: convert state_queue work to
> delayed_work") missed converting 'expires' value to 'delay' value.
>
> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Applied, thank you very much.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-16 9:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-15 16:05 [PATCH] phylib: Fix delay argument of schedule_delayed_work Atsushi Nemoto
2009-04-15 18:37 ` Marcin Slusarz
2009-04-16 9:43 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).