Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[sfrench/cifs-2.6.git] / drivers / i2c / busses / i2c-powermac.c

diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index dba8e387f43f66a10a428c4c6882b9abb6710492..1c440a70ec6139c8c6bfe5b1fd9195608dd9de71 100644 (file)
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -108,16 +108,25 @@ static s32 i2c_powermac_smbus_xfer(       struct i2c_adapter*     adap,
        }
 
        rc = pmac_i2c_open(bus, 0);
-       if (rc)
+       if (rc) {
+               dev_err(&adap->dev, "Failed to open I2C, err %d\n", rc);
                return rc;
+       }
 
        rc = pmac_i2c_setmode(bus, mode);
-       if (rc)
+       if (rc) {
+               dev_err(&adap->dev, "Failed to set I2C mode %d, err %d\n",
+                       mode, rc);
                goto bail;
+       }
 
        rc = pmac_i2c_xfer(bus, addrdir, subsize, subaddr, buf, len);
-       if (rc)
+       if (rc) {
+               dev_err(&adap->dev,
+                       "I2C transfer at 0x%02x failed, size %d, err %d\n",
+                       addrdir >> 1, size, rc);
                goto bail;
+       }
 
        if (size == I2C_SMBUS_WORD_DATA && read) {
                data->word = ((u16)local[1]) << 8;
@@ -153,16 +162,23 @@ static int i2c_powermac_master_xfer(      struct i2c_adapter *adap,
                return -EINVAL;
        read = (msgs->flags & I2C_M_RD) != 0;
        addrdir = (msgs->addr << 1) | read;
-       if (msgs->flags & I2C_M_REV_DIR_ADDR)
-               addrdir ^= 1;
 
        rc = pmac_i2c_open(bus, 0);
-       if (rc)
+       if (rc) {
+               dev_err(&adap->dev, "Failed to open I2C, err %d\n", rc);
                return rc;
+       }
        rc = pmac_i2c_setmode(bus, pmac_i2c_mode_std);
-       if (rc)
+       if (rc) {
+               dev_err(&adap->dev, "Failed to set I2C mode %d, err %d\n",
+                       pmac_i2c_mode_std, rc);
                goto bail;
+       }
        rc = pmac_i2c_xfer(bus, addrdir, 0, 0, msgs->buf, msgs->len);
+       if (rc < 0)
+               dev_err(&adap->dev, "I2C %s 0x%02x failed, err %d\n",
+                       addrdir & 1 ? "read from" : "write to", addrdir >> 1,
+                       rc);
  bail:
        pmac_i2c_close(bus);
        return rc < 0 ? rc : 1;
@@ -186,19 +202,16 @@ static const struct i2c_algorithm i2c_powermac_algorithm = {
 static int __devexit i2c_powermac_remove(struct platform_device *dev)
 {
        struct i2c_adapter      *adapter = platform_get_drvdata(dev);
-       struct pmac_i2c_bus     *bus = i2c_get_adapdata(adapter);
        int                     rc;
 
        rc = i2c_del_adapter(adapter);
-       pmac_i2c_detach_adapter(bus, adapter);
-       i2c_set_adapdata(adapter, NULL);
        /* We aren't that prepared to deal with this... */
        if (rc)
                printk(KERN_WARNING
                       "i2c-powermac.c: Failed to remove bus %s !\n",
                       adapter->name);
        platform_set_drvdata(dev, NULL);
-       kfree(adapter);
+       memset(adapter, 0, sizeof(*adapter));
 
        return 0;
 }
@@ -209,12 +222,12 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)
        struct pmac_i2c_bus *bus = dev->dev.platform_data;
        struct device_node *parent = NULL;
        struct i2c_adapter *adapter;
-       char name[32];
        const char *basename;
        int rc;
 
        if (bus == NULL)
                return -EINVAL;
+       adapter = pmac_i2c_get_adapter(bus);
 
        /* Ok, now we need to make up a name for the interface that will
         * match what we used to do in the past, that is basically the
@@ -240,29 +253,22 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)
        default:
                return -EINVAL;
        }
-       snprintf(name, 32, "%s %d", basename, pmac_i2c_get_channel(bus));
+       snprintf(adapter->name, sizeof(adapter->name), "%s %d", basename,
+                pmac_i2c_get_channel(bus));
        of_node_put(parent);
 
-       adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
-       if (adapter == NULL) {
-               printk(KERN_ERR "i2c-powermac: can't allocate inteface !\n");
-               return -ENOMEM;
-       }
        platform_set_drvdata(dev, adapter);
-       strcpy(adapter->name, name);
        adapter->algo = &i2c_powermac_algorithm;
        i2c_set_adapdata(adapter, bus);
        adapter->dev.parent = &dev->dev;
-       pmac_i2c_attach_adapter(bus, adapter);
        rc = i2c_add_adapter(adapter);
        if (rc) {
                printk(KERN_ERR "i2c-powermac: Adapter %s registration "
-                      "failed\n", name);
-               i2c_set_adapdata(adapter, NULL);
-               pmac_i2c_detach_adapter(bus, adapter);
+                      "failed\n", adapter->name);
+               memset(adapter, 0, sizeof(*adapter));
        }
 
-       printk(KERN_INFO "PowerMac i2c bus %s registered\n", name);
+       printk(KERN_INFO "PowerMac i2c bus %s registered\n", adapter->name);
 
        if (!strncmp(basename, "uni-n", 5)) {
                struct device_node *np;