Staging: rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe

[net-next-2.6.git] / drivers / staging / rt2860 / rt_pci_rbus.c

diff --git a/drivers/staging/rt2860/rt_pci_rbus.c b/drivers/staging/rt2860/rt_pci_rbus.c
index e0a0aeeb17a2c8b192513527f5128c5f572691bf..acdf09f148e893cb2079e738aab2ba1fb970f87c 100644 (file)
--- a/drivers/staging/rt2860/rt_pci_rbus.c
+++ b/drivers/staging/rt2860/rt_pci_rbus.c
@@ -790,10 +790,9 @@ IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance)
  * invaild or writeback cache
  * and convert virtual address to physical address
  */
-dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size,
-                               int sd_idx, int direction)
+dma_addr_t linux_pci_map_single(struct rt_rtmp_adapter *pAd, void *ptr,
+                               size_t size, int sd_idx, int direction)
 {
-       struct rt_rtmp_adapter *pAd;
        struct os_cookie *pObj;
 
        /*
@@ -812,7 +811,6 @@ dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size,
           sd_idx = -1
         */
 
-       pAd = (struct rt_rtmp_adapter *)handle;
        pObj = (struct os_cookie *)pAd->OS_Cookie;
 
        if (sd_idx == 1) {
@@ -826,13 +824,11 @@ dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size,
 
 }
 
-void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size,
-                           int direction)
+void linux_pci_unmap_single(struct rt_rtmp_adapter *pAd, dma_addr_t dma_addr,
+                           size_t size, int direction)
 {
-       struct rt_rtmp_adapter *pAd;
        struct os_cookie *pObj;
 
-       pAd = (struct rt_rtmp_adapter *)handle;
        pObj = (struct os_cookie *)pAd->OS_Cookie;
 
        pci_unmap_single(pObj->pci_dev, dma_addr, size, direction);