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

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

diff --git a/lincan/src/pikronisa.c b/lincan/src/pikronisa.c
index fb6e3dceaff9f58d7731589ff66875906edd457d..703adade9be0658527e76c2bd308d668ff64ea60 100644 (file)
--- a/lincan/src/pikronisa.c
+++ b/lincan/src/pikronisa.c
@@ -44,13 +44,13 @@ int pikronisa_request_io(struct candevice_t *candev)
 {
         int remap_addr;
        
 {
         int remap_addr;
        

-       if (!request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - pikronisa")) {
+       if (!can_request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - pikronisa")) {

                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);
                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;
        
        }
                return -ENODEV;
        
        }


@@ -75,7 +75,7 @@ int pikronisa_release_io(struct candevice_t *candev)
 {
        /* release I/O memory mapping */
        iounmap((void*)candev->dev_base_addr);
 {
        /* release I/O memory mapping */
        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;
 }
 
        return 0;
 }