aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/hv/osd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/hv/osd.c')
-rw-r--r--drivers/staging/hv/osd.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index ad883c93ec9..007a5532d13 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,