Merge tag 'powerpc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / drivers / i2c / i2c-core-base.c

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 573b5da..63ebf72 100644 (file)
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -549,17 +549,18 @@ put_sync_adapter:
 
 static int i2c_device_remove(struct device *dev)
 {
-       struct i2c_client       *client = i2c_verify_client(dev);
+       struct i2c_client       *client = to_i2c_client(dev);
        struct i2c_driver       *driver;
-       int status = 0;
-
-       if (!client || !dev->driver)
-               return 0;
 
        driver = to_i2c_driver(dev->driver);
        if (driver->remove) {
+               int status;
+
                dev_dbg(dev, "remove\n");
+
                status = driver->remove(client);
+               if (status)
+                       dev_warn(dev, "remove failed (%pe), will be ignored\n", ERR_PTR(status));
        }
 
        dev_pm_domain_detach(&client->dev, true);
@@ -571,7 +572,8 @@ static int i2c_device_remove(struct device *dev)
        if (client->flags & I2C_CLIENT_HOST_NOTIFY)
                pm_runtime_put(&client->adapter->dev);
 
-       return status;
+       /* return always 0 because there is WIP to make remove-functions void */
+       return 0;
 }
 
 static void i2c_device_shutdown(struct device *dev)