diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-29 18:39:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:53 -0400 |
commit | fa56d361b07513cba87cc5c2b57f3f51248f89a8 (patch) | |
tree | b07a8b549d3c457637396b873534bc03e7180489 /drivers/staging/hv/osd.c | |
parent | 4a66384567dfa68fb0bf6604842b1262e601d4a2 (diff) |
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 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) | |||
90 | 90 | ||
91 | void *MemMapIO(unsigned long phys, unsigned long size) | 91 | void *MemMapIO(unsigned long phys, unsigned long size) |
92 | { | 92 | { |
93 | return (void*)GetVirtualAddress(phys); /* return ioremap_nocache(phys, size); */ | 93 | return (void*)phys_to_virt(phys); /* return ioremap_nocache(phys, size); */ |
94 | } | 94 | } |
95 | 95 | ||
96 | void MemUnmapIO(void *virt) | 96 | void MemUnmapIO(void *virt) |
@@ -180,27 +180,6 @@ int WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs) | |||
180 | return ret; | 180 | return ret; |
181 | } | 181 | } |
182 | 182 | ||
183 | void* Physical2LogicalAddr(unsigned long PhysAddr) | ||
184 | { | ||
185 | void* logicalAddr = phys_to_virt(PhysAddr); | ||
186 | BUG_ON(!virt_addr_valid(logicalAddr)); | ||
187 | return logicalAddr; | ||
188 | } | ||
189 | |||
190 | unsigned long Logical2PhysicalAddr(void * LogicalAddr) | ||
191 | { | ||
192 | BUG_ON(!virt_addr_valid(LogicalAddr)); | ||
193 | return virt_to_phys(LogicalAddr); | ||
194 | } | ||
195 | |||
196 | |||
197 | unsigned long Virtual2Physical(void * VirtAddr) | ||
198 | { | ||
199 | unsigned long pfn = vmalloc_to_pfn(VirtAddr); | ||
200 | |||
201 | return pfn << PAGE_SHIFT; | ||
202 | } | ||
203 | |||
204 | static void osd_callback_work(struct work_struct *work) | 183 | static void osd_callback_work(struct work_struct *work) |
205 | { | 184 | { |
206 | struct osd_callback_struct *cb = container_of(work, | 185 | struct osd_callback_struct *cb = container_of(work, |