Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / i2c / algos / i2c-algo-bit.c

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index a39e6cff86e7ad8d64b5b786e7b5452f9290a458..38319a69bd0a9de978fc688bded38fa3dea90def 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -600,12 +600,14 @@ static const struct i2c_algorithm i2c_bit_algo = {
 /*
  * registering functions to load algorithms at runtime
  */
-static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
+static int __i2c_bit_add_bus(struct i2c_adapter *adap,
+                            int (*add_adapter)(struct i2c_adapter *))
 {
        struct i2c_algo_bit_data *bit_adap = adap->algo_data;
+       int ret;
 
        if (bit_test) {
-               int ret = test_bus(bit_adap, adap->name);
+               ret = test_bus(bit_adap, adap->name);
                if (ret < 0)
                        return -ENODEV;
        }
@@ -614,30 +616,27 @@ static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
        adap->algo = &i2c_bit_algo;
        adap->retries = 3;
 
+       ret = add_adapter(adap);
+       if (ret < 0)
+               return ret;
+
+       /* Complain if SCL can't be read */
+       if (bit_adap->getscl == NULL) {
+               dev_warn(&adap->dev, "Not I2C compliant: can't read SCL\n");
+               dev_warn(&adap->dev, "Bus may be unreliable\n");
+       }
        return 0;
 }
 
 int i2c_bit_add_bus(struct i2c_adapter *adap)
 {
-       int err;
-
-       err = i2c_bit_prepare_bus(adap);
-       if (err)
-               return err;
-
-       return i2c_add_adapter(adap);
+       return __i2c_bit_add_bus(adap, i2c_add_adapter);
 }
 EXPORT_SYMBOL(i2c_bit_add_bus);
 
 int i2c_bit_add_numbered_bus(struct i2c_adapter *adap)
 {
-       int err;
-
-       err = i2c_bit_prepare_bus(adap);
-       if (err)
-               return err;
-
-       return i2c_add_numbered_adapter(adap);
+       return __i2c_bit_add_bus(adap, i2c_add_numbered_adapter);
 }
 EXPORT_SYMBOL(i2c_bit_add_numbered_bus);