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

Commit 092462c2 authored by Geliang Tang's avatar Geliang Tang Committed by Greg Kroah-Hartman
Browse files

misc: eeprom: use kobj_to_dev() 



Use kobj_to_dev() instead of open-coding it.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c99d8e6

drivers/misc/eeprom/at24.c

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static ssize_t at24_bin_read(struct file *filp, struct kobject *kobj, 
{

	struct at24_data *at24;



	at24 = dev_get_drvdata(container_of(kobj, struct device, kobj));

	at24 = dev_get_drvdata(kobj_to_dev(kobj));

	return at24_read(at24, buf, off, count);

}
@@ -420,7 +420,7 @@ static ssize_t at24_bin_write(struct file *filp, struct kobject *kobj, 
{

	struct at24_data *at24;



	at24 = dev_get_drvdata(container_of(kobj, struct device, kobj));

	at24 = dev_get_drvdata(kobj_to_dev(kobj));

	return at24_write(at24, buf, off, count);

}

drivers/misc/eeprom/at25.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ at25_bin_read(struct file *filp, struct kobject *kobj, 
	struct device		*dev;

	struct at25_data	*at25;



	dev = container_of(kobj, struct device, kobj);

	dev = kobj_to_dev(kobj);

	at25 = dev_get_drvdata(dev);



	return at25_ee_read(at25, buf, off, count);
@@ -273,7 +273,7 @@ at25_bin_write(struct file *filp, struct kobject *kobj, 
	struct device		*dev;

	struct at25_data	*at25;



	dev = container_of(kobj, struct device, kobj);

	dev = kobj_to_dev(kobj);

	at25 = dev_get_drvdata(dev);



	return at25_ee_write(at25, buf, off, count);

drivers/misc/eeprom/eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static ssize_t eeprom_read(struct file *filp, struct kobject *kobj, 
			   struct bin_attribute *bin_attr,

			   char *buf, loff_t off, size_t count)

{

	struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));

	struct i2c_client *client = to_i2c_client(kobj_to_dev(kobj));

	struct eeprom_data *data = i2c_get_clientdata(client);

	u8 slice;

drivers/misc/eeprom/eeprom_93xx46.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ eeprom_93xx46_bin_read(struct file *filp, struct kobject *kobj, 
	int bits, ret;

	u16 cmd_addr;



	dev = container_of(kobj, struct device, kobj);

	dev = kobj_to_dev(kobj);

	edev = dev_get_drvdata(dev);



	cmd_addr = OP_READ << edev->addrlen;
@@ -190,7 +190,7 @@ eeprom_93xx46_bin_write(struct file *filp, struct kobject *kobj, 
	struct device *dev;

	int i, ret, step = 1;



	dev = container_of(kobj, struct device, kobj);

	dev = kobj_to_dev(kobj);

	edev = dev_get_drvdata(dev);



	/* only write even number of bytes on 16-bit devices */