From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [PATCH] drivers/net/3c523.c : time_after() macro
Date: Thu, 14 Apr 2005 21:37:16 +0000 [thread overview]
Message-ID: <425EE28C.1020604@feitoza.com.br> (raw)
According to Nish's suggestion, here is the patch correction, using the
time_after() macro,
defined in linux/jiffies.h. Any problem, please, mail-me.
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
--- linux/drivers/net/3c523.c 2005-03-02 04:38:38.000000000 -0300
+++ development/drivers/net/3c523.c 2005-04-14 18:31:24.000000000 -0300
@@ -105,6 +105,7 @@
#include <linux/mca-legacy.h>
#include <linux/ethtool.h>
#include <linux/bitops.h>
+#include <linux/jiffies.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
@@ -620,7 +621,7 @@
static int init586(struct net_device *dev)
{
void *ptr;
- unsigned long s;
+ unsigned long end_jiffies;
int i, result = 0;
struct priv *p = (struct priv *) dev->priv;
volatile struct configure_cmd_struct *cfg_cmd;
@@ -657,9 +658,9 @@
p->scb->cmd = CUC_START; /* cmd.-unit start */
elmc_id_attn586();
- s = jiffies; /* warning: only active with interrupts on !! */
+ end_jiffies = jiffies + 30*HZ/100; /* warning: only active
with interrupts on !! */
while (!(cfg_cmd->cmd_status & STAT_COMPL)) {
- if (jiffies - s > 30*HZ/100)
+ if (time_after(jiffies, end_jiffies))
break;
}
@@ -683,9 +684,9 @@
p->scb->cmd = CUC_START; /* cmd.-unit start */
elmc_id_attn586();
- s = jiffies;
+ end_jiffies = jiffies + 30*HZ/100;
while (!(ias_cmd->cmd_status & STAT_COMPL)) {
- if (jiffies - s > 30*HZ/100)
+ if (time_after(jiffies, end_jiffies))
break;
}
@@ -708,9 +709,9 @@
p->scb->cmd = CUC_START; /* cmd.-unit start */
elmc_attn586();
- s = jiffies;
+ end_jiffies = jiffies + 30*HZ/100;
while (!(tdr_cmd->cmd_status & STAT_COMPL)) {
- if (jiffies - s > 30*HZ/100) {
+ if (time_after(jiffies, end_jiffies)) {
printk(KERN_WARNING "%s: %d Problems while running the
TDR.\n", dev->name, __LINE__);
result = 1;
break;
@@ -797,9 +798,9 @@
p->scb->cbl_offset = make16(mc_cmd);
p->scb->cmd = CUC_START;
elmc_id_attn586();
- s = jiffies;
+ end_jiffies = jiffies + 30*HZ/100;
while (!(mc_cmd->cmd_status & STAT_COMPL)) {
- if (jiffies - s > 30*HZ/100)
+ if (time_after(jiffies, end_jiffies))
break;
}
if (!(mc_cmd->cmd_status & STAT_COMPL)) {
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
reply other threads:[~2005-04-14 21:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=425EE28C.1020604@feitoza.com.br \
--to=marcelo@feitoza.com.br \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.