Changeset 5571

Timestamp:

12/15/08 14:29:18 (4 years ago)

Author:

khali

Message:

Rename adapter locking and unlocking macros to match what upstream
has.

Files:

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

i2c/trunk/kernel/i2c-core.c

@@ -36 +36 @@
 /* ----- global defines ---------------------------------------------------- */
 
-#define I2C_LOCK_LIST(adap) down(&adap->lock)
-#define I2C_UNLOCK_LIST(adap) up(&adap->lock)
+/* exclusive access to the bus */
+#define I2C_LOCK(adap) down(&adap->lock)
+#define I2C_UNLOCK(adap) up(&adap->lock) 
 
 #define DEB(x) if (i2c_debug>=1) x;
@@ -314 +315 @@
         int rval;
 
-        I2C_LOCK_LIST(adapter);
+        I2C_LOCK(adapter);
         rval = __i2c_check_addr(adapter, addr);
-        I2C_UNLOCK_LIST(adapter);
+        I2C_UNLOCK(adapter);
 
         return rval;
@@ -329 +330 @@
                 return -EBUSY;
 
-        I2C_LOCK_LIST(adapter);
+        I2C_LOCK(adapter);
         for (i = 0; i < I2C_CLIENT_MAX; i++)
                 if (NULL == adapter->clients[i])
@@ -337 +338 @@
                        " i2c-core.o: attach_client(%s) - enlarge I2C_CLIENT_MAX.\n",
                         client->name);
-                I2C_UNLOCK_LIST(adapter);
+                I2C_UNLOCK(adapter);
                 return -ENOMEM;
         }
         adapter->clients[i] = client;
-        I2C_UNLOCK_LIST(adapter);
+        I2C_UNLOCK(adapter);
         
         if (adapter->client_register) 
@@ -374 +375 @@
                 }
 
-        I2C_LOCK_LIST(adapter);
+        I2C_LOCK(adapter);
         for (i = 0; i < I2C_CLIENT_MAX; i++)
                 if (client == adapter->clients[i])
@@ -382 +383 @@
                                     "[%s] not found\n",
                         client->name);
-                I2C_UNLOCK_LIST(adapter);
+                I2C_UNLOCK(adapter);
                 return -ENODEV;
         }
         adapter->clients[i] = NULL;
-        I2C_UNLOCK_LIST(adapter);
+        I2C_UNLOCK(adapter);
 
         DEB(printk(KERN_DEBUG "i2c-core.o: client [%s] unregistered.\n",client->name));
@@ -583 +584 @@
            sorted by address */
         order_nr=0;
-        I2C_LOCK_LIST(adap);
+        I2C_LOCK(adap);
         for (j = 0; j < I2C_CLIENT_MAX; j++) {
             if ((client = adap->clients[j]) && 
@@ -606 +607 @@
                            client->driver->name);
         }
-        I2C_UNLOCK_LIST(adap);
+        I2C_UNLOCK(adap);
         up(&core_lists);
         
@@ -693 +694 @@
                 }
 
-                down(&adap->lock);
+                I2C_LOCK(adap);
                 ret = adap->algo->master_xfer(adap,msgs,num);
-                up(&adap->lock);
+                I2C_UNLOCK(adap);
 
                 return ret;
@@ -720 +721 @@
                         count,client->adapter->name));
         
-                down(&adap->lock);
+                I2C_LOCK(adap);
                 ret = adap->algo->master_xfer(adap,&msg,1);
-                up(&adap->lock);
+                I2C_UNLOCK(adap);
 
                 /* if everything went ok (i.e. 1 msg transmitted), return #bytes
@@ -750 +751 @@
                         count,client->adapter->name));
         
-                down(&adap->lock);
+                I2C_LOCK(adap);
                 ret = adap->algo->master_xfer(adap,&msg,1);
-                up(&adap->lock);
+                I2C_UNLOCK(adap);
         
                 DEB2(printk(KERN_DEBUG "i2c-core.o: master_recv: return:%d (count:%d, addr:0x%02x)\n",
@@ -1347 +1348 @@
 
         if (adapter->algo->smbus_xfer) {
-                down(&adapter->lock);
+                I2C_LOCK(adapter);
                 res = adapter->algo->smbus_xfer(adapter,addr,flags,read_write,
                                                 command,size,data);
-                up(&adapter->lock);
+                I2C_UNLOCK(adapter);
         } else
                 res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write,