Skip to contentSkip to conversation

jiffies_round -> jiffies_round_relative conversion in EDAC drivers

PATCH In review Anton Blanchard 4 participants 10 messages Oct 15, 2007 – Oct 17, 2007

Subsystems (2)
Networking drivers (wireless) EDAC-core
lore
Share & tools
lore

Anton Blanchard

author
#0 lore raw

PATCH 1/1 jiffies_round -> jiffies_round_relative conversion in EDAC drivers

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

Signed-off-by Anton Blanchard <[email protected]>

---

drivers/edac/edac_device.c +2 -2
index f3690a6..46400ec 100644
@@ -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);
drivers/edac/edac_pci.c +1 -1
index 5dee9f5..7573e07 100644
@@ -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);
author
#1 lore raw

PATCH 1/1 jiffies_round -> jiffies_round_relative conversion - ipw2100/ipw2200

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

Signed-off-by Anton Blanchard <[email protected]>

---

drivers/net/wireless/ipw2100.c +5 -4
index 2d46a16..739d060 100644
@@ -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;
 	}
drivers/net/wireless/ipw2200.c +3 -3
index feb8fcb..88b0f81 100644
@@ -1753,7 +1753,7 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio)
 			/* Make sure the RF_KILL check timer is running */
 			cancel_delayed_work(&priv->rf_kill);
 			queue_delayed_work(priv->workqueue, &priv->rf_kill,
-					   round_jiffies(2 * HZ));
+					   round_jiffies_relative(2 * HZ));
 		} else
 			queue_work(priv->workqueue, &priv->up);
 	}

@@ -4364,7 +4364,7 @@ static void handle_scan_event(struct ipw_priv *priv)
 	if (!priv->user_requested_scan) {
 		if (!delayed_work_pending(&priv->scan_event))
 			queue_delayed_work(priv->workqueue, &priv->scan_event,
-					 round_jiffies(msecs_to_jiffies(4000)));
+					 round_jiffies_relative(msecs_to_jiffies(4000)));
 	} else {
 		union iwreq_data wrqu;
 

@@ -4728,7 +4728,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
 				 && priv->status & STATUS_ASSOCIATED)
 				queue_delayed_work(priv->workqueue,
 						   &priv->request_scan,
-						   round_jiffies(HZ));
+						   round_jiffies_relative(HZ));
 
 			/* Send an empty event to user space.
 			 * We don't send the received data on the event because
author
#2 lore raw

PATCH 1/1 jiffies_round -> jiffies_round_relative conversion - rt2x00

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

Signed-off-by Anton Blanchard <[email protected]>

---

drivers/net/wireless/rt2x00/rt2x00lib.h +1 -1
index 298faa9..06d9bc0 100644
@@ -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 )
 
 /*
author
#3 lore raw

PATCH 1/1 jiffies_round -> jiffies_round_relative conversion - b43/b43legacy

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

Signed-off-by Anton Blanchard <[email protected]>

---

drivers/net/wireless/b43/main.c +1 -1
index c141a26..41049a4 100644
@@ -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);
drivers/net/wireless/b43legacy/main.c +1 -1
index f074951..bd0bd9b 100644
@@ -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:
Acked-by on v1 1/1
#6 lore raw

Re: [Rt2400-devel] [PATCH] jiffies_round -> jiffies_round_relative conversion - rt2x00

In reply to Anton Blanchard
Quoted 4 lines · Anton Blanchard

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

Signed-off-by Anton Blanchard <[email protected]>
Acked-by Ivo van Doorn <[email protected]>
Quoted 26 lines

---

drivers/net/wireless/rt2x00/rt2x00lib.h +1 -2
index 298faa9..06d9bc0 100644
@@ -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 )
 
 /*
 
-------------------------------------------------------------------------

This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Rt2400-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rt2400-devel

#8 lore raw

Re: [PATCH] jiffies_round -> jiffies_round_relative conversion - ipw2100/ipw2200

In reply to Anton Blanchard
Quoted 3 lines · Anton Blanchard

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

ACK.

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

-yi