vserver 2.0 rc7

[linux-2.6.git] / drivers / i2c / algos / i2c-algo-ite.c

diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c
index 1b2c67c..68e9e68 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -490,7 +490,7 @@ static int iic_readbytes(struct i2c_adapter *i2c_adap, char *buf, int count,
  * condition.
  */
 #if 0
-static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) 
+static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) 
 {
    int i;
    struct i2c_msg *pmsg;
@@ -600,7 +600,7 @@ static inline int iic_doAddress(struct i2c_algo_iic_data *adap,
  * verify that the bus is not busy or in some unknown state.
  */
 static int iic_xfer(struct i2c_adapter *i2c_adap,
-                   struct i2c_msg msgs[], 
+                   struct i2c_msg *msgs, 
                    int num)
 {
        struct i2c_algo_iic_data *adap = i2c_adap->algo_data;
@@ -713,14 +713,11 @@ static u32 iic_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: ------------------------------------- */
 
 static struct i2c_algorithm iic_algo = {
-       "ITE IIC algorithm",
-       I2C_ALGO_IIC,
-       iic_xfer,               /* master_xfer  */
-       NULL,                           /* smbus_xfer   */
-       NULL,                           /* slave_xmit           */
-       NULL,                           /* slave_recv           */
-       algo_control,                   /* ioctl                */
-       iic_func,                       /* functionality        */
+       .name           = "ITE IIC algorithm",
+       .id             = I2C_ALGO_IIC,
+       .master_xfer    = iic_xfer,
+       .algo_control   = algo_control, /* ioctl */
+       .functionality  = iic_func,
 };