2009-04-15 16:06:05

by Atsushi Nemoto

Subject: [PATCH] phylib: Fix delay argument of schedule_delayed_work

The commit a390d1f3 ("phylib: convert state_queue work to
delayed_work") missed converting 'expires' value to 'delay' value.

Signed-off-by: Atsushi Nemoto <[email protected]>
---
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

2009-04-15 18:38:25

by Marcin Slusarz

Subject: Re: [PATCH] phylib: Fix delay argument of schedule_delayed_work

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 <[email protected]>

Acked-by: Marcin Slusarz <[email protected]>

> ---
> 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);
> }

2009-04-16 09:44:16

by David Miller

Subject: Re: [PATCH] phylib: Fix delay argument of schedule_delayed_work

From: Atsushi Nemoto <[email protected]>
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 <[email protected]>

Applied, thank you very much.