diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-16 11:50:41 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:48 -0700 |
commit | b4362c9c1fe8bec487e275f92fdf57c585ac236a (patch) | |
tree | 33ab67caca4adaa5ab6b11e8ccc4b66bac9c2d4c /drivers/staging/hv | |
parent | 3bcfa88868fd9338606d66ee8ae18aa45fa36566 (diff) |
Staging: hv: osd: remove Sleep wrapper
Use the "real" udelay call instead of a wrapper function.
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv')
-rw-r--r-- | drivers/staging/hv/NetVsc.c | 9 | ||||
-rw-r--r-- | drivers/staging/hv/StorVsc.c | 7 | ||||
-rw-r--r-- | drivers/staging/hv/include/osd.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/osd.c | 5 |
4 files changed, 9 insertions, 14 deletions
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index 7a7a382a45a..3039812a17c 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c @@ -24,6 +24,7 @@ #include <linux/kernel.h> #include <linux/mm.h> +#include <linux/delay.h> #include "include/logging.h" #include "NetVsc.h" #include "RndisFilter.h" @@ -200,7 +201,7 @@ static inline NETVSC_DEVICE* ReleaseOutboundNetDevice(DEVICE_OBJECT *Device) // Busy wait until the ref drop to 2, then set it to 1 while (InterlockedCompareExchange(&netDevice->RefCount, 1, 2) != 2) { - Sleep(100); + udelay(100); } return netDevice; @@ -217,7 +218,7 @@ static inline NETVSC_DEVICE* ReleaseInboundNetDevice(DEVICE_OBJECT *Device) // Busy wait until the ref drop to 1, then set it to 0 while (InterlockedCompareExchange(&netDevice->RefCount, 0, 1) != 1) { - Sleep(100); + udelay(100); } Device->Extension = NULL; @@ -923,7 +924,7 @@ NetVscOnDeviceRemove( { DPRINT_INFO(NETVSC, "waiting for %d requests to complete...", netDevice->NumOutstandingSends); - Sleep(100); + udelay(100); } DPRINT_INFO(NETVSC, "Disconnecting from netvsp..."); @@ -1318,7 +1319,7 @@ retry_send_cmplt: if (retries < 4) { - Sleep(100); + udelay(100); goto retry_send_cmplt; } else diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c index 2cf49635979..e15f57067b9 100644 --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c @@ -26,6 +26,7 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/mm.h> +#include <linux/delay.h> #include "include/logging.h" #include "include/StorVscApi.h" @@ -225,7 +226,7 @@ static inline STORVSC_DEVICE* ReleaseStorDevice(DEVICE_OBJECT *Device) // Busy wait until the ref drop to 2, then set it to 1 while (InterlockedCompareExchange(&storDevice->RefCount, 1, 2) != 2) { - Sleep(100); + udelay(100); } return storDevice; @@ -242,7 +243,7 @@ static inline STORVSC_DEVICE* FinalReleaseStorDevice(DEVICE_OBJECT *Device) // Busy wait until the ref drop to 1, then set it to 0 while (InterlockedCompareExchange(&storDevice->RefCount, 0, 1) != 1) { - Sleep(100); + udelay(100); } Device->Extension = NULL; @@ -582,7 +583,7 @@ StorVscOnDeviceRemove( { DPRINT_INFO(STORVSC, "waiting for %d requests to complete...", storDevice->NumOutstandingRequests); - Sleep(100); + udelay(100); } DPRINT_INFO(STORVSC, "removing storage device (%p)...", Device->Extension); diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index d6568f51029..504d585e713 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -110,8 +110,6 @@ extern int InterlockedIncrement(int *val); extern int InterlockedDecrement(int *val); extern int InterlockedCompareExchange(int *val, int new, int curr); -extern void Sleep(unsigned long usecs); - extern void* VirtualAllocExec(unsigned int size); extern void VirtualFree(void* VirtAddr); diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index 27408277b13..0c2ad4916cb 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c @@ -131,11 +131,6 @@ int InterlockedCompareExchange(int *val, int new, int curr) } -void Sleep(unsigned long usecs) -{ - udelay(usecs); -} - void* VirtualAllocExec(unsigned int size) { #ifdef __x86_64__ |