Eliminated test on LINUX_V2x in favor of LINUX_VERSION_CODE tests.

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 3275a7a7d4755036916a09898761e168f635fa2d..d8db350f72fadb115e36f16bd75861dbdb77f564 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -23,7 +23,6 @@
 
 #undef DEBUG
 
-#include <linux/comedi_rt.h>
 
 #define __NO_VERSION__
 #include <linux/module.h>
@@ -35,15 +34,16 @@
 #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/malloc.h>
-#include <asm/io.h>
-#ifdef LINUX_V22
 #include <linux/kmod.h>
-#include <asm/uaccess.h>
-#endif
-#if LINUX_VERSION_CODE >= 0x020100
 #include <linux/poll.h>
-#endif
-#include <kvmem.h>
+
+#include <linux/comedidev.h>
+
+#include <asm/io.h>
+#include <asm/uaccess.h>
+
+#include "kvmem.h"
+
 
 comedi_device *comedi_devices;
 
@@ -1235,7 +1235,14 @@ static int do_cancel(comedi_device *dev,comedi_subdevice *s)
        return ret;
 }
 
-#ifdef LINUX_V22
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,2,0)  /* XXX */
+#define RDEV_OF_FILE(x)        ((x)->f_inode->i_rdev)
+#else
+#define RDEV_OF_FILE(x)        ((x)->f_dentry->d_inode->i_rdev)
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
 void comedi_unmap(struct vm_area_struct *area)
 {
        comedi_async *async;
@@ -1280,7 +1287,11 @@ static int comedi_mmap_v22(struct file * file, struct vm_area_struct *vma)
                return -EINVAL;
        }
 
-       if(VM_OFFSET(vma) != 0){
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
+       if(vma->vm_offset != 0){
+#else
+       if(vma->vm_pgoff != 0){
+#endif
                DPRINTK("comedi: mmap() offset must be 0.\n");
                return -EINVAL;
        }
@@ -1713,7 +1724,7 @@ static int comedi_fasync (int fd, struct file *file, int on)
        kernel compatibility
 */
 
-#ifdef LINUX_V20
+#if LINUX_VERSION_CODE < 0x020100
 
 static int comedi_write_v20(struct inode *inode,struct file *file,const char *buf,int nbytes)
 {
@@ -1749,7 +1760,7 @@ static struct file_operations comedi_fops={
 
 #endif
 
-#ifdef LINUX_V22
+#if LINUX_VERSION_CODE >= 0x020200
 
 #define comedi_ioctl_v22 comedi_ioctl
 #define comedi_open_v22 comedi_fop_open

diff --git a/comedi/comedi_ksyms.c b/comedi/comedi_ksyms.c
index 885d447e3482942c3a0c199618a4b72c79fe62e4..d1f81760dd4cae32c199c4040770cdc7a4397daa 100644 (file)
--- a/comedi/comedi_ksyms.c
+++ b/comedi/comedi_ksyms.c
@@ -31,7 +31,7 @@
 
 
 
-#ifdef LINUX_V22
+#if LINUX_VERSION_CODE >= 0x020200
 
 /* for drivers */
 EXPORT_SYMBOL(comedi_driver_register);

diff --git a/comedi/drivers.c b/comedi/drivers.c
index 9dd1d609a54ffe4c9534c016b7dac1c5f710bd29..d64f64023d7cbd6a6d2e803703fe2d0d4f629a6a 100644 (file)
--- a/comedi/drivers.c
+++ b/comedi/drivers.c
@@ -21,12 +21,9 @@
 
 */
 
-#include <linux/comedidev.h>
-#include <kvmem.h>
 
 #define __NO_VERSION__
 #include <linux/module.h>
-
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -35,8 +32,12 @@
 #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/malloc.h>
+#include <linux/comedidev.h>
+
 #include <asm/io.h>
 
+#include "kvmem.h"
+
 #ifdef CONFIG_COMEDI_TRIG
 /* in comedi/trig.c */
 int command_trig(comedi_device *dev,comedi_subdevice *s,comedi_trig *it);

diff --git a/comedi/range.c b/comedi/range.c
index 4becd522fccd845629c533ec357151235f30bfd7..a5da9cb4e158c89b89d8c9534f49c6db53e7f389 100644 (file)
--- a/comedi/range.c
+++ b/comedi/range.c
@@ -22,9 +22,7 @@
 */
 
 #include <linux/comedidev.h>
-#ifdef LINUX_V22
 #include <asm/uaccess.h>
-#endif
 
 
 comedi_lrange range_bipolar10={ 1, {BIP_RANGE(10)}};