Merge remote-tracking branch 'xen-tip/linux-next'

[deliverable/linux.git] / drivers / i2c / busses / i2c-bcm-iproc.c

diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c
index 95f7cac76f89bfeac68ad22521d8c38c2df348c8..326b3db02c48b2cfce1591243e5db8e9b57855ba 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm-iproc.c
+++ b/drivers/i2c/busses/i2c-bcm-iproc.c
@@ -488,13 +488,7 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev)
        adap->dev.parent = &pdev->dev;
        adap->dev.of_node = pdev->dev.of_node;
 
-       ret = i2c_add_adapter(adap);
-       if (ret) {
-               dev_err(iproc_i2c->device, "failed to add adapter\n");
-               return ret;
-       }
-
-       return 0;
+       return i2c_add_adapter(adap);
 }
 
 static int bcm_iproc_i2c_remove(struct platform_device *pdev)