From: Javier Martinez Canillas <martinez.javier@gmail.com>
To: Matt Carlson <mcarlson@broadcom.com>
Cc: Michael Chan <mchan@broadcom.com>,
Grant Likely <grant.likely@secretlab.ca>,
netdev@vger.kernel.org, kernelnewbies@kernelnewbies.org,
Javier Martinez Canillas <martinez.javier@gmail.com>
Subject: [PATCH 1/5] tg3: use usleep_range not msleep for small sleeps
Date: Tue, 1 Mar 2011 18:04:26 +0100 [thread overview]
Message-ID: <1298999069-12740-2-git-send-email-martinez.javier@gmail.com> (raw)
In-Reply-To: <1298999069-12740-1-git-send-email-martinez.javier@gmail.com>
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
drivers/net/tg3.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 6be4185..3310c7a 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -2410,7 +2410,7 @@ static int tg3_nvram_read_using_eeprom(struct tg3 *tp,
if (tmp & EEPROM_ADDR_COMPLETE)
break;
- msleep(1);
+ usleep_range(1000, 2000);
}
if (!(tmp & EEPROM_ADDR_COMPLETE))
return -EBUSY;
@@ -2688,7 +2688,7 @@ static int tg3_power_down_prepare(struct tg3 *tp)
tg3_read_mem(tp, NIC_SRAM_FW_ASF_STATUS_MBOX, &val);
if (val == ~NIC_SRAM_FIRMWARE_MBOX_MAGIC1)
break;
- msleep(1);
+ usleep_range(1000, 2000);
}
}
if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
@@ -8901,7 +8901,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
break;
}
- msleep(10);
+ usleep_range(10000, 20000);
}
tg3_disable_ints(tp);
@@ -11863,7 +11863,7 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
(EEPROM_DEFAULT_CLOCK_PERIOD <<
EEPROM_ADDR_CLKPERD_SHIFT)));
- msleep(1);
+ usleep_range(1000, 2000);
/* Enable seeprom accesses. */
tw32_f(GRC_LOCAL_CTRL,
@@ -11956,7 +11956,7 @@ static int tg3_nvram_write_block_using_eeprom(struct tg3 *tp,
if (val & EEPROM_ADDR_COMPLETE)
break;
- msleep(1);
+ usleep_range(1000, 2000);
}
if (!(val & EEPROM_ADDR_COMPLETE)) {
rc = -EBUSY;
@@ -12263,7 +12263,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
pci_read_config_word(tp->pdev, tp->pm_cap + PCI_PM_CTRL, &pmcsr);
pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
pci_write_config_word(tp->pdev, tp->pm_cap + PCI_PM_CTRL, pmcsr);
- msleep(1);
+ usleep_range(1000, 2000);
/* Make sure register accesses (indirect or otherwise)
* will function correctly.
--
1.7.2.3
next prev parent reply other threads:[~2011-03-01 17:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 17:04 [PATCH 1/5] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> Javier Martinez Canillas
2011-03-01 17:04 ` Javier Martinez Canillas [this message]
2011-03-03 4:55 ` [PATCH 1/5] tg3: use usleep_range not msleep for small sleeps David Miller
2011-03-03 12:14 ` Javier Martinez Canillas
2011-03-01 17:04 ` [PATCH 3/5] tg3: Enclose macro with complex values in parenthesis Javier Martinez Canillas
2011-03-03 4:56 ` David Miller
2011-03-03 11:54 ` Javier Martinez Canillas
2011-03-01 17:04 ` [PATCH 4/5] tg3: Don't use IRQF_SAMPLE_RANDOM Javier Martinez Canillas
2011-03-01 17:04 ` [PATCH 5/5] tg3: Fix inline keyword usage Javier Martinez Canillas
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=1298999069-12740-2-git-send-email-martinez.javier@gmail.com \
--to=martinez.javier@gmail.com \
--cc=grant.likely@secretlab.ca \
--cc=kernelnewbies@kernelnewbies.org \
--cc=mcarlson@broadcom.com \
--cc=mchan@broadcom.com \
--cc=netdev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).