Changeset 3411

Timestamp:

11/30/99 21:06:42 (13 years ago)

Author:

frodo

Message:

Patches to make it compatible with kernel 2.3.27 and newer

* Improved monitoring of /proc directories

Instead of doing:

proc_bus_i2c->fill_inode = &monitor_bus_i2c;
void monitor_bus_i2c(struct inode *inode, int fill)
{

if (fill)

MOD_INC_USE_COUNT;

else

MOD_DEC_USE_COUNT;

}

you can now simply set:

proc_bus_i2c->owner = THIS_MODULE;

and this is just as good!

* An old 2.3 problem seemingly never was resolved yet: instead of using

a *wait_queue directly, you have to use a wait_queue_head_t and
initialize it properly:

#if (LINUX_VERSION_CODE < 0x020301)
static struct wait_queue *pcf_wait = NULL;
#else
static wait_queue_head_t pcf_wait;
#endif

#if (LINUX_VERSION_CODE >= 0x020301)

init_waitqueue_head(&pcf_wait);

#endif

except for this, semantics remain the same (but using a plain
wait_queue_head_t instead of a pointer to a wait_queue)

Location:

i2c/trunk/kernel

Files:

• i2c-core.c (modified) (4 diffs)
• i2c-elektor.c (modified) (2 diffs)

i2c/trunk/kernel/i2c-core.c

@@ -113 +113 @@
 static int i2cproc_cleanup(void);
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) && \
+    (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,27))
 static void monitor_bus_i2c(struct inode *inode, int fill);
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
@@ -236 +237 @@
                 }
                 proc_entry->ops = &i2cproc_inode_operations;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27))
+                proc_entry->owner = THIS_MODULE;
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
                 proc_entry->fill_inode = &monitor_bus_i2c;
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) */
@@ -530 +533 @@
 #ifdef CONFIG_PROC_FS
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58)) && \
+    (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,27))
 /* Monitor access to /proc/bus/i2c*; make unloading i2c-proc impossible
    if some process still uses it or some file in it */
@@ -641 +645 @@
         }
         proc_bus_i2c->read_proc = &read_bus_i2c;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27))
+        proc_bus_i2c->owner = THIS_MODULE;
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,58))
         proc_bus_i2c->fill_inode = &monitor_bus_i2c;
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,29)) */

i2c/trunk/kernel/i2c-elektor.c

@@ -63 +63 @@
 static int i2c_debug=0;
 static struct i2c_pcf_isa gpi;
+#if (LINUX_VERSION_CODE < 0x020301)
 static struct wait_queue *pcf_wait = NULL;
+#else
+static wait_queue_head_t pcf_wait;
+#endif
 static int pcf_pending;
-
 
 /* ----- global defines ----------------------------------------------- */
@@ -282 +285 @@
 
    pcf_isa_data.data = (void *)pisa;
+#if (LINUX_VERSION_CODE >= 0x020301)
+   init_waitqueue_head(&pcf_wait);
+#endif
    if (pcf_isa_init() == 0) {
       if (i2c_pcf_add_bus(&pcf_isa_ops) < 0)