Whitespace cleanup in some LinCAN source files to prepare for integration of Jan...

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

diff --git a/lincan/src/main.c b/lincan/src/main.c
index e114082fff1b887cf01101d65266d6dd116c4857..c0c6d0085d2a9a69af16352fdc86225a024606b5 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"*/
@@ -185,7 +185,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,
@@ -216,7 +216,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");
@@ -271,14 +271,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;
        }
 
@@ -297,7 +297,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;
@@ -324,8 +324,10 @@ int init_module(void)
         {
            #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
                char dev_name[32];
-           #else
+           #elif  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */
                struct class_device *this_dev;
+           #else
+               struct device *this_dev;
            #endif
                int dev_minor;
                for(i=0;i<MAX_TOT_MSGOBJS;i++) {
@@ -340,14 +342,18 @@ int init_module(void)
                    #else
                      #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,14))
                        this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
-                     #else /* >= 2.6.15 */
+                     #elif  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */
                        this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
-                     #endif /* >= 2.6.15 */
+                     #else /* >= 2.6.26 */
+                       this_dev=device_create_drvdata(can_class, NULL, MKDEV(major, dev_minor), objects_p[i],  "can%d", dev_minor);
+                     #endif /* >= 2.6.26 */
                        if(IS_ERR(this_dev)){
                                CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor);
+                     #if  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
                        }else{
                                /*this_dev->class_data=objects_p[i];*/
                                class_set_devdata(this_dev,objects_p[i]);
+                     #endif /* <= 2.6.25 */
                        }
                      #ifdef CONFIG_DEVFS_FS
                        devfs_mk_cdev(MKDEV(major, dev_minor), S_IFCHR | S_IRUGO | S_IWUGO, "can%d", dev_minor);
@@ -361,7 +367,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: ;
@@ -388,7 +394,7 @@ int init_module(void)
                CANMSG("No CAN devices or driver setup error.\n");
 
        register_error:
-               if ( can_del_mem_list() ) 
+               if ( can_del_mem_list() )
                        CANMSG("Error deallocating memory\n");
 
                return -ENODEV;
@@ -396,11 +402,13 @@ int init_module(void)
 
 void cleanup_module(void)
 {
+#if defined(CONFIG_DEVFS_FS) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
        int i=0;
+#endif
 
 #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))
@@ -416,7 +424,11 @@ void cleanup_module(void)
                    #ifdef CONFIG_DEVFS_FS
                        devfs_remove("can%d", dev_minor);
                    #endif
+                   #if  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
                        class_device_destroy(can_class, MKDEV(major, dev_minor));
+                   #else /* >= 2.6.26 */
+                       device_destroy(can_class, MKDEV(major, dev_minor));
+                   #endif /* >= 2.6.26 */
                }
            #endif
                }
@@ -433,7 +445,7 @@ 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");
 
        unregister_chrdev(major,DEVICE_NAME);