i2c: dev: don't start function name with 'return'
authorWolfram Sang <wsa@the-dreams.de>
Fri, 27 May 2016 11:13:01 +0000 (13:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 May 2020 14:40:26 +0000 (16:40 +0200)
commit 72a71f869c95dc11b73f09fe18c593d4a0618c3f upstream.

I stumbled multiple times over 'return_i2c_dev', especially before the
actual 'return res'. It makes the code hard to read, so reanme the
function to 'put_i2c_dev' which also better matches 'get_free_i2c_dev'.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/i2c/i2c-dev.c

index 5fecc1d9e0a1aca8882375a61e309a0b0f5016f2..382c66d5a4708d8e89c8f56b1b6aa68d2ea571ec 100644 (file)
@@ -91,7 +91,7 @@ static struct i2c_dev *get_free_i2c_dev(struct i2c_adapter *adap)
        return i2c_dev;
 }
 
-static void return_i2c_dev(struct i2c_dev *i2c_dev)
+static void put_i2c_dev(struct i2c_dev *i2c_dev)
 {
        spin_lock(&i2c_dev_list_lock);
        list_del(&i2c_dev->list);
@@ -582,7 +582,7 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy)
 error:
        cdev_del(&i2c_dev->cdev);
 error_cdev:
-       return_i2c_dev(i2c_dev);
+       put_i2c_dev(i2c_dev);
        return res;
 }
 
@@ -599,7 +599,7 @@ static int i2cdev_detach_adapter(struct device *dev, void *dummy)
        if (!i2c_dev) /* attach_adapter must have failed */
                return 0;
 
-       return_i2c_dev(i2c_dev);
+       put_i2c_dev(i2c_dev);
        device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
        cdev_del(&i2c_dev->cdev);