6 files changed, 8 insertions, 29 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index fb5b732238ed..df05df1a0ef6 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -519,8 +519,6 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm i2c_bit_algo = {
-        .name           = "Bit-shift algorithm",
-        .id             = I2C_ALGO_BIT,
         .master_xfer    = bit_xfer,
         .functionality  = bit_func,
 };
@@ -541,8 +539,6 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
         DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= i2c_bit_algo.id;
         adap->algo = &i2c_bit_algo;
 
         adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c
index e6cae39f47aa..2db7bfc85225 100644
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -713,8 +713,6 @@ static u32 iic_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm iic_algo = {
-        .name           = "ITE IIC algorithm",
-        .id             = I2C_ALGO_IIC,
         .master_xfer    = iic_xfer,
         .algo_control   = algo_control, /* ioctl */
         .functionality  = iic_func,
@@ -738,8 +736,6 @@ int i2c_iic_add_bus(struct i2c_adapter *adap)
                     adap->name));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= iic_algo.id;
         adap->algo = &iic_algo;
 
         adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index cc3a952401f2..beb10edfe9c1 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -187,12 +187,14 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
         int numbytes = 0;
         int state;
         int ret;
+        int timeout = 100;
 
-        state = pca_status(adap);
-        if ( state != 0xF8 ) {
-                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state );
-                /* FIXME: what to do. Force stop ? */
-                return -EREMOTEIO;
+        while ((state = pca_status(adap)) != 0xf8 && timeout--) {
+                msleep(10);
+        }
+        if (state != 0xf8) {
+                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state);
+                return -EIO;
         }
 
         DEB1("{{{ XFER %d messages\n", num);
@@ -354,8 +356,6 @@ static int pca_init(struct i2c_algo_pca_data *adap)
 }
 
 static struct i2c_algorithm pca_algo = {
-        .name           = "PCA9564 algorithm",
-        .id             = I2C_ALGO_PCA,
         .master_xfer    = pca_xfer,
         .functionality  = pca_func,
 };
@@ -369,8 +369,6 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)
         int rval;
 
         /* register new adapter to i2c module... */
-
-        adap->id |= pca_algo.id;
         adap->algo = &pca_algo;
 
         adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 8d087dac32af..6e498df1f717 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -459,8 +459,6 @@ static u32 pcf_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm pcf_algo = {
-        .name           = "PCF8584 algorithm",
-        .id             = I2C_ALGO_PCF,
         .master_xfer    = pcf_xfer,
         .functionality  = pcf_func,
 };
@@ -476,8 +474,6 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
         DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= pcf_algo.id;
         adap->algo = &pcf_algo;
 
         adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
index 422721b241e5..932c4fa86c73 100644
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -149,7 +149,7 @@ static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
                         err = i2c_write(adap, p->buf, p->len);
         }
 
-        return err;
+        return (err < 0) ? err : i;
 }
 
 static u32 sgi_func(struct i2c_adapter *adap)
@@ -158,8 +158,6 @@ static u32 sgi_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm sgi_algo = {
-        .name           = "SGI algorithm",
-        .id             = I2C_ALGO_SGI,
         .master_xfer    = sgi_xfer,
         .functionality  = sgi_func,
 };
@@ -169,7 +167,6 @@ static struct i2c_algorithm sgi_algo = {
  */
 int i2c_sgi_add_bus(struct i2c_adapter *adap)
 {
-        adap->id |= sgi_algo.id;
         adap->algo = &sgi_algo;
 
         return i2c_add_adapter(adap);
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c
index f2785499237b..8ed5ad12552f 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -135,8 +135,6 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm i2c_sibyte_algo = {
-        .name           = "SiByte algorithm",
-        .id             = I2C_ALGO_SIBYTE,
         .smbus_xfer     = smbus_xfer,
         .algo_control   = algo_control, /* ioctl */
         .functionality  = bit_func,
@@ -151,8 +149,6 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
         struct i2c_algo_sibyte_data *adap = i2c_adap->algo_data;
 
         /* register new adapter to i2c module... */
-
-        i2c_adap->id |= i2c_sibyte_algo.id;
         i2c_adap->algo = &i2c_sibyte_algo;
         
         /* Set the frequency to 100 kHz */