netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Mark Rustad <mark.d.rustad@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 01/12] ixgbe: Convert some udelays to usleep_range
Date: Fri, 25 Jul 2014 21:45:11 -0700	[thread overview]
Message-ID: <1406349922-9883-2-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1406349922-9883-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Mark Rustad <mark.d.rustad@intel.com>

Convert some udelay calls to the preferred usleep_range.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 6 +++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 3f318c5..db759f9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -1386,7 +1386,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
 			status = 0;
 			break;
 		}
-		udelay(50);
+		usleep_range(50, 100);
 	}
 
 	if (i == timeout) {
@@ -1399,7 +1399,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
 		 */
 		ixgbe_release_eeprom_semaphore(hw);
 
-		udelay(50);
+		usleep_range(50, 100);
 		/*
 		 * one last try
 		 * If the SMBI bit is 0 when we read it, then the bit will be
@@ -1427,7 +1427,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
 			if (swsm & IXGBE_SWSM_SWESMBI)
 				break;
 
-			udelay(50);
+			usleep_range(50, 100);
 		}
 
 		/*
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 40dd798..942ad13 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
@@ -699,7 +699,7 @@ static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
 			status = 0;
 			break;
 		}
-		udelay(50);
+		usleep_range(50, 100);
 	}
 
 	/* Now get the semaphore between SW/FW through the REGSMP bit */
@@ -709,7 +709,7 @@ static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
 			if (!(swsm & IXGBE_SWFW_REGSMP))
 				break;
 
-			udelay(50);
+			usleep_range(50, 100);
 		}
 	} else {
 		hw_dbg(hw, "Software semaphore SMBI between device drivers not granted.\n");
-- 
1.9.3

  reply	other threads:[~2014-07-26  4:45 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-26  4:45 [net-next 00/12][pull request] Intel Wired LAN Driver Updates 2014-07-25 Jeff Kirsher
2014-07-26  4:45 ` Jeff Kirsher [this message]
2014-07-26  4:45 ` [net-next 02/12] ixgbe: Fix spurious release of semaphore in EEPROM access Jeff Kirsher
2014-07-26  4:45 ` [net-next 03/12] ixgbe: Correct X540 semaphore error Jeff Kirsher
2014-07-26  4:45 ` [net-next 04/12] ixgbe: Fix ixgbe_write_mbx error result Jeff Kirsher
2014-07-26  4:45 ` [net-next 05/12] ixgbe: Delete a bunch of dead code Jeff Kirsher
2014-07-26  4:45 ` [net-next 06/12] ixgbevf: Remove unused get_supported_physical_layer pointer Jeff Kirsher
2014-07-26  4:45 ` [net-next 07/12] ixgbe: Make return values more direct Jeff Kirsher
2014-07-26  4:45 ` [net-next 08/12] e1000e: Fix CRC errors with jumbo traffic Jeff Kirsher
2014-07-26  4:45 ` [net-next 09/12] e1000e: Add code to check return values on NVM accesses Jeff Kirsher
2014-07-26  4:45 ` [net-next 10/12] e1000e: Add support for EEE in Sx states Jeff Kirsher
2014-07-26  4:45 ` [net-next 11/12] e1000e: Fix EEE in S5 w/ Runtime PM enabled Jeff Kirsher
2014-07-26 15:10   ` Francois Romieu
2014-07-29 16:14     ` Ertman, David M
2014-07-29 22:11       ` Francois Romieu
2014-07-26  4:45 ` [net-next 12/12] e1000e: Fix Runtime PM blocks EEE link negotiation in S5 Jeff Kirsher
2014-07-28 19:21 ` [net-next 00/12][pull request] Intel Wired LAN Driver Updates 2014-07-25 David Miller

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=1406349922-9883-2-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=mark.d.rustad@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /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).