Changeset 3487

Timestamp:

07/26/00 01:52:17 (13 years ago)

Author:

frodo

Message:

Sync with kernel 2.4.0-test5-pre4

Location:

i2c/trunk/kernel

Files:

• i2c-dev.c (modified) (4 diffs)
• i2c-elektor.c (modified) (1 diff)

i2c/trunk/kernel/i2c-dev.c

@@ -33 +33 @@
 #include <linux/malloc.h>
 #include <linux/version.h>
+#if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0)
+#include <linux/smp_lock.h>
+#endif /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
 
 /* If you want debugging uncomment: */
@@ -77 +80 @@
 
 static struct file_operations i2cdev_fops = {
+#if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0)
+        owner:          THIS_MODULE,
+#endif /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
         llseek:         i2cdev_lseek,
         read:           i2cdev_read,
@@ -375 +381 @@
         if (i2cdev_adaps[minor]->inc_use)
                 i2cdev_adaps[minor]->inc_use(i2cdev_adaps[minor]);
+#if LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,0)
         MOD_INC_USE_COUNT;
+#endif /* LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,0) */
 
 #ifdef DEBUG
@@ -391 +399 @@
         printk("i2c-dev.o: Closed: i2c-%d\n", minor);
 #endif
-        MOD_DEC_USE_COUNT;
+#if LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,0)
+        MOD_INC_USE_COUNT;
+#else /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
+        lock_kernel();
+#endif /* LINUX_KERNEL_VERSION < KERNEL_VERSION(2,4,0) */
         if (i2cdev_adaps[minor]->dec_use)
                 i2cdev_adaps[minor]->dec_use(i2cdev_adaps[minor]);
+#if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0)
+        unlock_kernel();
+#endif /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
         return 0;
 }

i2c/trunk/kernel/i2c-elektor.c

@@ -232 +232 @@
 };
 
-static int __init i2c_pcfisa_init(void) 
+int __init i2c_pcfisa_init(void) 
 {