Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0919771b authored by Wolfram Sang's avatar Wolfram Sang Committed by TARKZiM
Browse files

i2c: dev: don't start function name with 'return' 



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: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Change-Id: Ibdaa3c769a5bd38014f7bcfee5db299d9398f957
parent dc923100

drivers/i2c/i2c-dev.c

+3 −3
Original line number Diff line number Diff line
@@ -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);
@@ -585,7 +585,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;

}
@@ -602,7 +602,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);