Home » Mailing list archives » linux-kernel » 2007 » October » 15

Re: [PATCH] jiffies_round -> jiffies_round_relative conversion - b43/b43legacy

Previous thread: [ patch .24-rc0 5/5 ] SuperIO locks coordinator - use in other hwmon/*.c by Jim Cromie on Monday, October 15, 2007 - 1:11 am. (1 message)

Next thread: [PATCH][resend] param_sysfs_builtin memchr argument fix by Dave Young on Monday, October 15, 2007 - 1:39 am. (1 message)
[view original message]
From: Anton Blanchard <anton@...>
To: <dougthompson@...>
Cc: <arjan@...>, <linux-kernel@...>, <bluesmoke-devel@...>
Subject: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion in EDAC drivers
Date: Monday, October 15, 2007 - 1:34 am

When rounding a relative timeout we need to use round_jiffies_relative(). 


Signed-off-by: Anton Blanchard <anton@samba.org>

---


diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c

index f3690a6..46400ec 100644

--- a/drivers/edac/edac_device.c

+++ b/drivers/edac/edac_device.c

@@ -436,7 +436,7 @@ static void edac_device_workq_function(struct work_struct *work_req)

 	 */

 	if (edac_dev->poll_msec == 1000)

 		queue_delayed_work(edac_workqueue, &edac_dev->work,

-				round_jiffies(edac_dev->delay));

+				round_jiffies_relative(edac_dev->delay));

 	else

 		queue_delayed_work(edac_workqueue, &edac_dev->work,

 				edac_dev->delay);

@@ -468,7 +468,7 @@ void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,

 	 */

 	if (edac_dev->poll_msec == 1000)

 		queue_delayed_work(edac_workqueue, &edac_dev->work,

-				round_jiffies(edac_dev->delay));

+				round_jiffies_relative(edac_dev->delay));

 	else

 		queue_delayed_work(edac_workqueue, &edac_dev->work,

 				edac_dev->delay);

diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c

index 5dee9f5..7573e07 100644

--- a/drivers/edac/edac_pci.c

+++ b/drivers/edac/edac_pci.c

@@ -246,7 +246,7 @@ static void edac_pci_workq_function(struct work_struct *work_req)

 		/* if we are on a one second period, then use round */

 		msec = edac_pci_get_poll_msec();

 		if (msec == 1000)

-			delay = round_jiffies(msecs_to_jiffies(msec));

+			delay = round_jiffies_relative(msecs_to_jiffies(msec));

 		else

 			delay = msecs_to_jiffies(msec);


-
[view original message]
From: Arjan van de Ven <arjan@...>
To: Anton Blanchard <anton@...>
Cc: <dougthompson@...>, <linux-kernel@...>, <bluesmoke-devel@...>
Subject: Re: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion in EDAC drivers
Date: Monday, October 15, 2007 - 10:01 am

On Mon, 15 Oct 2007 00:34:28 -0500


Acked-by: Arjan van de Ven <arjan@linux.intel.com>

-
[view original message]
From: Anton Blanchard <anton@...>
To: <yi.zhu@...>, <jketreno@...>
Cc: <arjan@...>, <linux-kernel@...>, <linux-wireless@...>
Subject: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion - ipw2100/ipw2200
Date: Monday, October 15, 2007 - 1:38 am

When rounding a relative timeout we need to use round_jiffies_relative(). 


Signed-off-by: Anton Blanchard <anton@samba.org>

---


diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c

index 2d46a16..739d060 100644

--- a/drivers/net/wireless/ipw2100.c

+++ b/drivers/net/wireless/ipw2100.c

@@ -1769,7 +1769,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)

 		if (priv->stop_rf_kill) {

 			priv->stop_rf_kill = 0;

 			queue_delayed_work(priv->workqueue, &priv->rf_kill,

-					   round_jiffies(HZ));

+					   round_jiffies_relative(HZ));

 		}


 		deferred = 1;

@@ -2102,7 +2102,8 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)

 	/* Make sure the RF Kill check timer is running */

 	priv->stop_rf_kill = 0;

 	cancel_delayed_work(&priv->rf_kill);

-	queue_delayed_work(priv->workqueue, &priv->rf_kill, round_jiffies(HZ));

+	queue_delayed_work(priv->workqueue, &priv->rf_kill,

+			   round_jiffies_relative(HZ));

 }


 static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)

@@ -4237,7 +4238,7 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)

 			priv->stop_rf_kill = 0;

 			cancel_delayed_work(&priv->rf_kill);

 			queue_delayed_work(priv->workqueue, &priv->rf_kill,

-					   round_jiffies(HZ));

+					   round_jiffies_relative(HZ));

 		} else

 			schedule_reset(priv);

 	}

@@ -5975,7 +5976,7 @@ static void ipw2100_rf_kill(struct work_struct *work)

 		IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");

 		if (!priv->stop_rf_kill)

 			queue_delayed_work(priv->workqueue, &priv->rf_kill,

-					   round_jiffies(HZ));

+					   round_jiffies_relative(HZ));

 		goto exit_unlock;

 	}


diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c

index feb8fcb..88b0f81 100644

--- a/drivers/net/wireless/ipw2200.c

+++ b/drivers/net/wireless/ipw2200.c

@@ -1753,7 +1753,7 @@ static ...
[ message continues ]
[view original message]
From: Zhu Yi <yi.zhu@...>
To: Anton Blanchard <anton@...>, John W.Linville <linville@...>
Cc: <jketreno@...>, <arjan@...>, <linux-kernel@...>, <linux-wireless@...>
Subject: Re: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion - ipw2100/ipw2200
Date: Tuesday, October 16, 2007 - 10:40 pm

ACK.


John, please apply this patch to wireless-2.6. Thanks.


-yi

-
[view original message]
From: Arjan van de Ven <arjan@...>
To: Anton Blanchard <anton@...>
Cc: <yi.zhu@...>, <jketreno@...>, <linux-kernel@...>, <linux-wireless@...>
Subject: Re: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion - ipw2100/ipw2200
Date: Monday, October 15, 2007 - 10:01 am

On Mon, 15 Oct 2007 00:38:01 -0500


Acked-by: Arjan van de Ven <arjan@linux.intel.com>

-
[view original message]
From: Anton Blanchard <anton@...>
To: <rt2400-devel@...>
Cc: <arjan@...>, <linux-kernel@...>, <linux-wireless@...>
Subject: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion - rt2x00
Date: Monday, October 15, 2007 - 1:40 am

When rounding a relative timeout we need to use round_jiffies_relative(). 


Signed-off-by: Anton Blanchard <anton@samba.org>

---


diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h

index 298faa9..06d9bc0 100644

--- a/drivers/net/wireless/rt2x00/rt2x00lib.h

+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h

@@ -30,7 +30,7 @@

  * Interval defines

  * Both the link tuner as the rfkill will be called once per second.

  */

-#define LINK_TUNE_INTERVAL	( round_jiffies(HZ) )

+#define LINK_TUNE_INTERVAL	( round_jiffies_relative(HZ) )

 #define RFKILL_POLL_INTERVAL	( 1000 )


 /*

-
[view original message]
From: Ivo van Doorn <ivdoorn@...>
To: <rt2400-devel@...>
Cc: Anton Blanchard <anton@...>, <linux-wireless@...>, <arjan@...>, <linux-kernel@...>
Subject: Re: [Rt2400-devel] [PATCH] jiffies_round -&gt; jiffies_round_relative conversion - rt2x00
Date: Monday, October 15, 2007 - 2:08 pm

-
[view original message]
From: Arjan van de Ven <arjan@...>
To: Anton Blanchard <anton@...>
Cc: <rt2400-devel@...>, <linux-kernel@...>, <linux-wireless@...>
Subject: Re: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion - rt2x00
Date: Monday, October 15, 2007 - 10:01 am

On Mon, 15 Oct 2007 00:40:34 -0500


Acked-by: Arjan van de Ven <arjan@linux.intel.com>

-
[view original message]
From: Anton Blanchard <anton@...>
To: <Larry.Finger@...>, <mb@...>, <st3@...>
Cc: <arjan@...>, <linux-kernel@...>, <linux-wireless@...>
Subject: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion - b43/b43legacy
Date: Monday, October 15, 2007 - 1:42 am

When rounding a relative timeout we need to use round_jiffies_relative(). 


Signed-off-by: Anton Blanchard <anton@samba.org>

---


diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c

index c141a26..41049a4 100644

--- a/drivers/net/wireless/b43/main.c

+++ b/drivers/net/wireless/b43/main.c

@@ -2392,7 +2392,7 @@ out_requeue:

 	if (b43_debug(dev, B43_DBG_PWORK_FAST))

 		delay = msecs_to_jiffies(50);

 	else

-		delay = round_jiffies(HZ * 15);

+		delay = round_jiffies_relative(HZ * 15);

 	queue_delayed_work(wl->hw->workqueue, &dev->periodic_work, delay);

 out:

 	mutex_unlock(&wl->mutex);

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c

index f074951..bd0bd9b 100644

--- a/drivers/net/wireless/b43legacy/main.c

+++ b/drivers/net/wireless/b43legacy/main.c

@@ -2260,7 +2260,7 @@ out_requeue:

 	if (b43legacy_debug(dev, B43legacy_DBG_PWORK_FAST))

 		delay = msecs_to_jiffies(50);

 	else

-		delay = round_jiffies(HZ);

+		delay = round_jiffies_relative(HZ);

 	queue_delayed_work(dev->wl->hw->workqueue,

 			   &dev->periodic_work, delay);

 out:

-
[view original message]
From: Arjan van de Ven <arjan@...>
To: Anton Blanchard <anton@...>
Cc: <Larry.Finger@...>, <mb@...>, <st3@...>, <linux-kernel@...>, <linux-wireless@...>
Subject: Re: [PATCH] jiffies_round -&gt; jiffies_round_relative conversion - b43/b43legacy
Date: Monday, October 15, 2007 - 10:02 am

On Mon, 15 Oct 2007 00:42:23 -0500


Acked-by: Arjan van de Ven <arjan@linux.intel.com>

-
Previous thread: [ patch .24-rc0 5/5 ] SuperIO locks coordinator - use in other hwmon/*.c by Jim Cromie on Monday, October 15, 2007 - 1:11 am. (1 message)

Next thread: [PATCH][resend] param_sysfs_builtin memchr argument fix by Dave Young on Monday, October 15, 2007 - 1:39 am. (1 message)