Changeset 4245

Timestamp:

11/27/06 21:17:55 (7 years ago)

Author:

khali

Message:

GCC4 and whitespace changes to sync with the Linux 2.4 tree.

Location:

i2c/trunk

Files:

• doc/summary (modified) (1 diff)
• kernel/i2c-core.c (modified) (5 diffs)
• kernel/i2c-elektor.c (modified) (1 diff)
• kernel/i2c-id.h (modified) (3 diffs)
• kernel/i2c.h (modified) (4 diffs)

i2c/trunk/doc/summary

@@ -38 +38 @@
 a separate Adapter and Algorithm driver), and drivers for your I2C devices
 (usually one driver for each device). There are no I2C device drivers
-in this package. See the lm_sensors project http://www.lm-sensors.org
+in this package. See the lm_sensors project http://www.lm-sensors.org/
 for device drivers.
 

i2c/trunk/kernel/i2c-core.c

@@ -315 +315 @@
                 if (adapter->clients[i] && (adapter->clients[i]->addr == addr))
                         return -EBUSY;
-
         return 0;
 }
@@ -489 +488 @@
                 if (client->flags & I2C_CLIENT_ALLOW_MULTIPLE_USE)
                         client->usage_count++;
-                else if (client->usage_count > 0) 
+                else if (client->usage_count > 0)
                         return -EBUSY;
-                else 
+                else
                         client->usage_count++;
         }
@@ -685 +684 @@
  */
 
-int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num)
+int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs,int num)
 {
         int ret;
@@ -1347 +1346 @@
 
 
-s32 i2c_smbus_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags,
+s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
                    char read_write, u8 command, int size, 
                    union i2c_smbus_data * data)
@@ -1355 +1354 @@
         flags &= I2C_M_TEN | I2C_CLIENT_PEC;
 
-        if (adap->algo->smbus_xfer) {
-                down(&adap->bus);
-                res = adap->algo->smbus_xfer(adap,addr,flags,read_write,
+        if (adapter->algo->smbus_xfer) {
+                down(&adapter->bus);
+                res = adapter->algo->smbus_xfer(adapter,addr,flags,read_write,
                                                 command,size,data);
-                up(&adap->bus);
+                up(&adapter->bus);
         } else
-                res = i2c_smbus_xfer_emulated(adap,addr,flags,read_write,
+                res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write,
                                               command,size,data);
 

i2c/trunk/kernel/i2c-elektor.c

@@ -186 +186 @@
  */
 static struct i2c_algo_pcf_data pcf_isa_data = {
-        .setpcf     = pcf_isa_setbyte,
-        .getpcf     = pcf_isa_getbyte,
-        .getown     = pcf_isa_getown,
-        .getclock   = pcf_isa_getclock,
-        .waitforpin = pcf_isa_waitforpin,
-        .udelay     = 10,
-        .mdelay     = 10,
-        .timeout    = HZ,
+        .setpcf         = pcf_isa_setbyte,
+        .getpcf         = pcf_isa_getbyte,
+        .getown         = pcf_isa_getown,
+        .getclock       = pcf_isa_getclock,
+        .waitforpin     = pcf_isa_waitforpin,
+        .udelay         = 10,
+        .mdelay         = 10,
+        .timeout        = HZ,
 };
 

i2c/trunk/kernel/i2c-id.h

@@ -101 +101 @@
 #define I2C_DRIVERID_UDA1342    53      /* UDA1342 audio codec          */
 #define I2C_DRIVERID_ADV7170    54      /* video encoder                */
-#define I2C_DRIVERID_RADEON     55      /* I2C bus on Radeon boards     */
 #define I2C_DRIVERID_MAX1617    56      /* temp sensor                  */
-#define I2C_DRIVERID_SAA7191    57      /* video encoder                */
+#define I2C_DRIVERID_SAA7191    57      /* video decoder                */
 #define I2C_DRIVERID_INDYCAM    58      /* SGI IndyCam                  */
 #define I2C_DRIVERID_BT832      59      /* CMOS camera video processor  */
@@ -111 +110 @@
 #define I2C_DRIVERID_MAX6900    63      /* MAX6900 real-time clock      */
 #define I2C_DRIVERID_SAA7114H   64      /* video decoder                */
-
 
 #define I2C_DRIVERID_EXP0       0xF0    /* experimental use id's        */
@@ -203 +201 @@
 #define I2C_ALGO_IOP3XX 0x140000        /* XSCALE IOP3XX On-chip I2C alg */
 #define I2C_ALGO_SIBYTE 0x150000        /* Broadcom SiByte SOCs         */
-#define I2C_ALGO_SGI    0x160000        /* SGI algorithm                */
+#define I2C_ALGO_SGI    0x160000        /* SGI algorithm                */
 #define I2C_ALGO_USB    0x170000        /* USB algorithm                */
 #define I2C_ALGO_VIRT   0x180000        /* Virtual bus adapter          */

i2c/trunk/kernel/i2c.h

@@ -60 +60 @@
 union i2c_smbus_data;
 
+
 /*
  * The master routines are the ones normally used to transmit data to devices
@@ -71 +72 @@
 /* Transfer num messages.
  */
-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num);
+extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg,int num);
 
 
@@ -143 +144 @@
         int (*command)(struct i2c_client *client,unsigned int cmd, void *arg);
         
-        /* These two are used for bookkeeping & dynamic unloading of 
+        /* These two are used for bookkeeping & dynamic unloading of
          * kernel modules. inc_use tells the driver that a client is being  
          * used by another module & that it should increase its ref. counter.
@@ -196 +197 @@
            smbus_xfer. If set to NULL, the SMBus protocol is simulated
            using common I2C messages */
-        int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], 
+        int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs,
                            int num);
         int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr,