Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / i2c / busses / i2c-powermac.c

diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index da54e673449d284ab68ea74f2d52fb8bc9b24749..8dc90da1e6e657b6f0ca58d91bba9dda6c29a7e7 100644 (file)
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -213,14 +213,8 @@ static const struct i2c_algorithm i2c_powermac_algorithm = {
 static int i2c_powermac_remove(struct platform_device *dev)
 {
        struct i2c_adapter      *adapter = platform_get_drvdata(dev);
-       int                     rc;
-
-       rc = i2c_del_adapter(adapter);
-       /* 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);
+
+       i2c_del_adapter(adapter);
        memset(adapter, 0, sizeof(*adapter));
 
        return 0;