Fixes for SMP kernels and build for 2.2.xx and 2.6.xx kernels

[lincan.git] / lincan / src / pcm3680.c

diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c
index 2736035195b94442651629029ac0ee941c7a9a3b..a1ccf4a825cb40f22960da58b241a20cb0b537e3 100644 (file)
--- a/lincan/src/pcm3680.c
+++ b/lincan/src/pcm3680.c
@@ -19,13 +19,6 @@
 #include "../include/i82527.h"
 #include "../include/sja1000p.h"
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) /* may need correction */
-       #ifndef request_mem_region
-               #define request_mem_region(start,size,dev) (1)
-               #define release_mem_region(start,size) 
-       #endif /*request_mem_region*/
-#endif /* 2.4.0 */
-
 /*
  * IO_RANGE is the io-memory range that gets reserved, please adjust according
  * your hardware. Example: #define IO_RANGE 0x100 for i82527 chips or
@@ -50,13 +43,13 @@
 int pcm3680_request_io(struct candevice_t *candev)
 {
         unsigned long remap_addr;
-       if (!request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - pcm3680")) {
+       if (!can_request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - pcm3680")) {
                CANMSG("Unable to request IO-memory: 0x%lx\n",candev->io_addr);
                return -ENODEV;
        }
        if ( !( remap_addr = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) {
                CANMSG("Unable to access I/O memory at: 0x%lx\n", candev->io_addr);
-               release_mem_region(candev->io_addr,IO_RANGE);
+               can_release_mem_region(candev->io_addr,IO_RANGE);
                return -ENODEV;
        
        }
@@ -80,7 +73,7 @@ int pcm3680_request_io(struct candevice_t *candev)
 int pcm3680_release_io(struct candevice_t *candev)
 {
        iounmap((void*)candev->dev_base_addr);
-       release_mem_region(candev->io_addr,IO_RANGE);
+       can_release_mem_region(candev->io_addr,IO_RANGE);
        return 0;
 }