From wfp5p@virginia.edu Wed Jul 29 14:34:30 2009 From: Bill Pemberton Date: Wed, 29 Jul 2009 17:00:15 -0400 Subject: Staging: hv: remove wrapper functions around kmap_ To: greg@kroah.com Cc: hjanssen@microsoft.com Message-ID: <1248901215-29685-8-git-send-email-wfp5p@virginia.edu> Remove PageMapVirtualAddress() and PageUnmapVirtualAddress() which were wrappers around kmap_atomic() and kunmap_atomic() Signed-off-by: Bill Pemberton Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/RndisFilter.c | 10 ++++++---- drivers/staging/hv/include/osd.h | 4 ---- drivers/staging/hv/osd.c | 11 ----------- 3 files changed, 6 insertions(+), 19 deletions(-) --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -138,10 +138,6 @@ unsigned long Logical2PhysicalAddr(void unsigned long Virtual2Physical(void * VirtAddr); -void* PageMapVirtualAddress(unsigned long Pfn); -void PageUnmapVirtualAddress(void* VirtAddr); - - int osd_schedule_callback(struct workqueue_struct *wq, void (*func)(void *), void *data); --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c @@ -88,17 +88,6 @@ void PageFree(void* page, unsigned int c __free_page(p);*/ } - -void* PageMapVirtualAddress(unsigned long Pfn) -{ - return kmap_atomic(pfn_to_page(Pfn), KM_IRQ0); -} - -void PageUnmapVirtualAddress(void* VirtAddr) -{ - kunmap_atomic(VirtAddr, KM_IRQ0); -} - void *MemMapIO(unsigned long phys, unsigned long size) { return (void*)GetVirtualAddress(phys); /* return ioremap_nocache(phys, size); */ --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c @@ -22,7 +22,9 @@ */ #include -#include +#include +#include + #include "include/logging.h" #include "include/NetVscApi.h" @@ -518,7 +520,7 @@ RndisFilterOnReceive( return -1; } - rndisHeader = (RNDIS_MESSAGE*)PageMapVirtualAddress(Packet->PageBuffers[0].Pfn); + rndisHeader = (RNDIS_MESSAGE *)kmap_atomic(pfn_to_page(Packet->PageBuffers[0].Pfn), KM_IRQ0); rndisHeader = (void*)((unsigned long)rndisHeader + Packet->PageBuffers[0].Offset); @@ -528,7 +530,7 @@ RndisFilterOnReceive( #if 0 if ( Packet->TotalDataBufferLength != rndisHeader->MessageLength ) { - PageUnmapVirtualAddress((void*)(unsigned long)rndisHeader - Packet->PageBuffers[0].Offset); + kunmap_atomic(rndisHeader - Packet->PageBuffers[0].Offset, KM_IRQ0); DPRINT_ERR(NETVSC, "invalid rndis message? (expected %u bytes got %u)...dropping this message!", rndisHeader->MessageLength, Packet->TotalDataBufferLength); @@ -545,7 +547,7 @@ RndisFilterOnReceive( memcpy(&rndisMessage, rndisHeader, (rndisHeader->MessageLength > sizeof(RNDIS_MESSAGE))?sizeof(RNDIS_MESSAGE):rndisHeader->MessageLength); - PageUnmapVirtualAddress((void*)(unsigned long)rndisHeader - Packet->PageBuffers[0].Offset); + kunmap_atomic(rndisHeader - Packet->PageBuffers[0].Offset, KM_IRQ0); DumpRndisMessage(&rndisMessage);