Changeset 5570 for i2c/trunk/kernel/i2c-core.c

Timestamp:

12/15/08 13:45:58 (3 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.

Files:

• i2c/trunk/kernel/i2c-core.c (modified) (6 diffs)

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,