diff mbox

phylib: Fix delay argument of schedule_delayed_work

Message ID 1239811551-6101-1-git-send-email-anemo@mba.ocn.ne.jp
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Atsushi Nemoto April 15, 2009, 4:05 p.m. UTC
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(-)

Comments

Marcin Slusarz April 15, 2009, 6:37 p.m. UTC | #1
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);
>  }

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller April 16, 2009, 9:43 a.m. UTC | #2
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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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