diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-29 22:39:27 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 19:01:53 (GMT) |
commit | fa56d361b07513cba87cc5c2b57f3f51248f89a8 (patch) | |
tree | b07a8b549d3c457637396b873534bc03e7180489 /drivers/staging/hv/osd.c | |
parent | 4a66384567dfa68fb0bf6604842b1262e601d4a2 (diff) | |
download | linux-fa56d361b07513cba87cc5c2b57f3f51248f89a8.tar.xz |
Staging: hv: osd: remove physical address wrapper functions
Use the real functions the kernel provides, so that people can see what
is actually going on in the code easier.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/osd.c')
-rw-r--r-- | drivers/staging/hv/osd.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index ad883c9..007a5532 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c @@ -90,7 +90,7 @@ void PageFree(void* page, unsigned int count) void *MemMapIO(unsigned long phys, unsigned long size) { - return (void*)GetVirtualAddress(phys); /* return ioremap_nocache(phys, size); */ + return (void*)phys_to_virt(phys); /* return ioremap_nocache(phys, size); */ } void MemUnmapIO(void *virt) @@ -180,27 +180,6 @@ int WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs) return ret; } -void* Physical2LogicalAddr(unsigned long PhysAddr) -{ - void* logicalAddr = phys_to_virt(PhysAddr); - BUG_ON(!virt_addr_valid(logicalAddr)); - return logicalAddr; -} - -unsigned long Logical2PhysicalAddr(void * LogicalAddr) -{ - BUG_ON(!virt_addr_valid(LogicalAddr)); - return virt_to_phys(LogicalAddr); -} - - -unsigned long Virtual2Physical(void * VirtAddr) -{ - unsigned long pfn = vmalloc_to_pfn(VirtAddr); - - return pfn << PAGE_SHIFT; -} - static void osd_callback_work(struct work_struct *work) { struct osd_callback_struct *cb = container_of(work, |