Corrected bug caused by "The first round of I/O space pointers separation." patch.

[lincan.git] / lincan / include / can_sysdep.h

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index 019f985198e63bf188858dc5fc900a8593238d22..77f9d8afdc20e20e4ebe4e2d6d6b6ff2cd088696 100644 (file)
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -1,5 +1,5 @@
-/* can_sysdep.h - hides differences between individual Linux kernel 
- *                versions and RT extensions 
+/* can_sysdep.h - hides differences between individual Linux kernel
+ *                versions and RT extensions
  * Linux CAN-bus device driver.
  * Written by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
@@ -161,20 +161,20 @@
    #define can_ulong2ioptr(addr)   ((unsigned long)(addr))
    #define can_inb(ioaddr) inb(ioaddr)
    #define can_outb(data,ioaddr) outb(data,ioaddr)
-   #define can_inw(ioaddr) inb(ioaddr)
-   #define can_outw(data,ioaddr) outb(data,ioaddr)
-   #define can_inl(ioaddr) inb(ioaddr)
-   #define can_outl(data,ioaddr) outb(data,ioaddr)
+   #define can_inw(ioaddr) inw(ioaddr)
+   #define can_outw(data,ioaddr) outw(data,ioaddr)
+   #define can_inl(ioaddr) inl(ioaddr)
+   #define can_outl(data,ioaddr) outl(data,ioaddr)
 #else /* >=2.6.9 */
    typedef void __iomem * can_ioptr_t;
    #define can_ioptr2ulong(ioaddr) ((unsigned long __force)(ioaddr))
    #define can_ulong2ioptr(addr)   ((can_ioptr_t)(addr))
    #define can_inb(ioaddr) inb(can_ioptr2ulong(ioaddr))
    #define can_outb(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
-   #define can_inw(ioaddr) inb(can_ioptr2ulong(ioaddr))
-   #define can_outw(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
-   #define can_inl(ioaddr) inb(can_ioptr2ulong(ioaddr))
-   #define can_outl(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
+   #define can_inw(ioaddr) inw(can_ioptr2ulong(ioaddr))
+   #define can_outw(data,ioaddr) outw(data,can_ioptr2ulong(ioaddr))
+   #define can_inl(ioaddr) inl(can_ioptr2ulong(ioaddr))
+   #define can_outl(data,ioaddr) outl(data,can_ioptr2ulong(ioaddr))
 #endif
 
 #define can_readb  readb
@@ -245,7 +245,7 @@
 
 /*
  * terrible hack to test rtl_file private_data concept, ugh !!!
- * this would result in crash on architectures,  where 
+ * this would result in crash on architectures,  where
  * sizeof(int) < sizeof(void *)
  */
 #define can_set_rtl_file_private_data(fptr, p) do{ fptr->f_minor=(long)(p); } while(0)