Changeset 5570

Timestamp:

12/15/08 13:45:58 (4 years ago)

Author:

khali

Message:

Drop Linux 2.4 binary incompatibility mode. It didn't make any sense
to start with. Dropping it will make the code more simple and the
differences to the mainline kernel smaller.

Location:

i2c/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/i2c-core.c (modified) (6 diffs)
• kernel/i2c.h (modified) (2 diffs)

i2c/trunk/CHANGES

@@ -12 +12 @@
   doc/writing-clients: Cleanups (2.6 backport)
   i2c.h: Drop I2C_FUNC_SMBUS_*I2C_BLOCK_2 defines
+  i2c-core: Drop Linux 2.4 incompatibility mode
 
 2.10.5 (20071024)

i2c/trunk/kernel/i2c-core.c

@@ -36 +36 @@
 /* ----- global defines ---------------------------------------------------- */
 
-#if I2C_LINUX_2_4_BINARY_COMPATIBILITY
-#define I2C_LOCK_LIST(adap) down(&adap->bus)
-#define I2C_UNLOCK_LIST(adap) up(&adap->bus)
-#else
-#define I2C_LOCK_LIST(adap) down(&adap->list)
-#define I2C_UNLOCK_LIST(adap) up(&adap->list)
-#endif
+#define I2C_LOCK_LIST(adap) down(&adap->lock)
+#define I2C_UNLOCK_LIST(adap) up(&adap->lock)
 
 #define DEB(x) if (i2c_debug>=1) x;
@@ -114 +109 @@
         
         /* init data types */
-        init_MUTEX(&adap->bus);
-#if !I2C_LINUX_2_4_BINARY_COMPATIBILITY
-        init_MUTEX(&adap->list);
-#endif
+        init_MUTEX(&adap->lock);
 
         /* inform drivers of new adapters */
@@ -701 +693 @@
                 }
 
-                down(&adap->bus);
+                down(&adap->lock);
                 ret = adap->algo->master_xfer(adap,msgs,num);
-                up(&adap->bus);
+                up(&adap->lock);
 
                 return ret;
@@ -728 +720 @@
                         count,client->adapter->name));
         
-                down(&adap->bus);
+                down(&adap->lock);
                 ret = adap->algo->master_xfer(adap,&msg,1);
-                up(&adap->bus);
+                up(&adap->lock);
 
                 /* if everything went ok (i.e. 1 msg transmitted), return #bytes
@@ -758 +750 @@
                         count,client->adapter->name));
         
-                down(&adap->bus);
+                down(&adap->lock);
                 ret = adap->algo->master_xfer(adap,&msg,1);
-                up(&adap->bus);
+                up(&adap->lock);
         
                 DEB2(printk(KERN_DEBUG "i2c-core.o: master_recv: return:%d (count:%d, addr:0x%02x)\n",
@@ -1355 +1347 @@
 
         if (adapter->algo->smbus_xfer) {
-                down(&adapter->bus);
+                down(&adapter->lock);
                 res = adapter->algo->smbus_xfer(adapter,addr,flags,read_write,
                                                 command,size,data);
-                up(&adapter->bus);
+                up(&adapter->lock);
         } else
                 res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write,

i2c/trunk/kernel/i2c.h

@@ -31 +31 @@
 #define I2C_DATE "SVN"
 #define I2C_VERSION "2.10.5-SVN"
-
-/* You can set this to 0 if you patch i2c into your kernel tree
-   and have no i2c module that have been compiled using a
-   Linux-2.4-compatible i2c.h header file left. 
-   As a result, you'll get a different code (can't really
-   say whether it's any better, but it's different). */
-#define I2C_LINUX_2_4_BINARY_COMPATIBILITY 1
 
 #include <linux/module.h>
@@ -239 +232 @@
 
                         /* data fields that are valid for all devices   */
-        struct semaphore bus;
-#if !I2C_LINUX_2_4_BINARY_COMPATIBILITY
-        struct semaphore list;  
-#endif
+        struct semaphore lock;  
         unsigned int flags;/* flags specifying div. data                */
 
         struct i2c_client *clients[I2C_CLIENT_MAX];
-#if I2C_LINUX_2_4_BINARY_COMPATIBILITY
-        int client_count; /* not used anywhere */
-#endif
+        int client_count; /* not used anywhere, kept for binary compat. */
 
         int timeout;