Changes in kernel version dependent function calls, basic sja1000p structure in usbca...

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

diff --git a/lincan/src/main.c b/lincan/src/main.c
index 0bbf3655ade334bbbcabd73397bbe5e75de24071..319a09ea2a567cc38e4aaf99024fe611d4372fd9 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -38,7 +38,7 @@
  #endif
 #endif
 
-#if !defined (__GENKSYMS__) 
+#if !defined (__GENKSYMS__)
 #if (defined (MODVERSIONS) && !defined(NOVER))
 #include <linux/modversions.h>
 /*#include "../include/main.ver"*/
@@ -180,7 +180,7 @@ struct mem_addr *mem_head=NULL;
 struct file_operations can_fops=
 {
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0))
-       owner:          THIS_MODULE,    
+       owner:          THIS_MODULE,
  #endif
        read:           can_read,
        write:          can_write,
@@ -211,7 +211,7 @@ struct rtl_file_operations can_fops_rtl = {
 
 /*
  2.6 kernel attributes for sysfs
- 
+
 static ssize_t show_xxx(struct class_device *cdev, char *buf)
 {
         return sprintf(buf, "xxxx\n");
@@ -266,14 +266,14 @@ int init_module(void)
 
        for (i=0; i<hardware_p->nr_boards; i++) {
                candev=hardware_p->candevice[i];
-               if (candev->hwspecops->request_io(candev)) 
+               if (candev->hwspecops->request_io(candev))
                        goto request_io_error;
                candev->flags|=CANDEV_IO_RESERVED;
        }
 
        for (i=0; i<hardware_p->nr_boards; i++) {
                candev=hardware_p->candevice[i];
-               if (candev->hwspecops->reset(candev)) 
+               if (candev->hwspecops->reset(candev))
                        goto reset_error;
        }
 
@@ -292,7 +292,7 @@ int init_module(void)
                        }
 
                        chip->flags |= CHIP_ATTACHED;
-       
+
                        if(can_chip_setup_irq(chip)<0) {
                                CANMSG("Error to setup chip IRQ\n");
                                goto interrupt_error;
@@ -356,7 +356,7 @@ int init_module(void)
 #ifdef CONFIG_PROC_FS
        proc_error: ;
                CANMSG("Error registering /proc entry.\n");
-               goto memory_error; 
+               goto memory_error;
 #endif
 
        interrupt_error: ;
@@ -379,14 +379,18 @@ int init_module(void)
                canqueue_rtl_done();
                #endif /*CAN_WITH_RTL*/
 
+               #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0))
+               unregister_chrdev(major,DEVICE_NAME);
+               #else /*LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)*/
                res=unregister_chrdev(major,DEVICE_NAME);
                if (res<0)
                        CANMSG("Error unloading CAN driver, error: %d\n",res);
                else
                        CANMSG("No CAN devices or driver setup error.\n");
+               #endif /*LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)*/
 
        register_error:
-               if ( can_del_mem_list() ) 
+               if ( can_del_mem_list() )
                        CANMSG("Error deallocating memory\n");
 
                return -ENODEV;
@@ -398,7 +402,7 @@ void cleanup_module(void)
 
 #ifdef CONFIG_PROC_FS
        if (can_delete_procdir())
-               CANMSG("Error unregistering /proc/can entry.\n"); 
+               CANMSG("Error unregistering /proc/can entry.\n");
 #endif
 
 #if defined(CONFIG_DEVFS_FS) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
@@ -431,10 +435,14 @@ void cleanup_module(void)
        canqueue_rtl_done();
        #endif /*CAN_WITH_RTL*/
 
-       if ( can_del_mem_list() ) 
+       if ( can_del_mem_list() )
                CANMSG("Error deallocating memory\n");
 
+       #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0))
+       unregister_chrdev(major,DEVICE_NAME);
+       #else /*LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)*/
        res=unregister_chrdev(major,DEVICE_NAME);
        if (res<0)
                CANMSG("Error unregistering CAN driver, error: %d\n",res);
+       #endif /*LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)*/
 }