tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

misc: eeprom: use kobj_to_dev()

Use kobj_to_dev() instead of open-coding it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Geliang Tang and committed by
Greg Kroah-Hartman 092462c2 8c99d8e6

+7 -7
+2 -2
drivers/misc/eeprom/at24.c
··· 289 289 { 290 290 struct at24_data *at24; 291 291 292 - at24 = dev_get_drvdata(container_of(kobj, struct device, kobj)); 292 + at24 = dev_get_drvdata(kobj_to_dev(kobj)); 293 293 return at24_read(at24, buf, off, count); 294 294 } 295 295 ··· 420 420 { 421 421 struct at24_data *at24; 422 422 423 - at24 = dev_get_drvdata(container_of(kobj, struct device, kobj)); 423 + at24 = dev_get_drvdata(kobj_to_dev(kobj)); 424 424 return at24_write(at24, buf, off, count); 425 425 } 426 426
+2 -2
drivers/misc/eeprom/at25.c
··· 139 139 struct device *dev; 140 140 struct at25_data *at25; 141 141 142 - dev = container_of(kobj, struct device, kobj); 142 + dev = kobj_to_dev(kobj); 143 143 at25 = dev_get_drvdata(dev); 144 144 145 145 return at25_ee_read(at25, buf, off, count); ··· 273 273 struct device *dev; 274 274 struct at25_data *at25; 275 275 276 - dev = container_of(kobj, struct device, kobj); 276 + dev = kobj_to_dev(kobj); 277 277 at25 = dev_get_drvdata(dev); 278 278 279 279 return at25_ee_write(at25, buf, off, count);
+1 -1
drivers/misc/eeprom/eeprom.c
··· 84 84 struct bin_attribute *bin_attr, 85 85 char *buf, loff_t off, size_t count) 86 86 { 87 - struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj)); 87 + struct i2c_client *client = to_i2c_client(kobj_to_dev(kobj)); 88 88 struct eeprom_data *data = i2c_get_clientdata(client); 89 89 u8 slice; 90 90
+2 -2
drivers/misc/eeprom/eeprom_93xx46.c
··· 45 45 int bits, ret; 46 46 u16 cmd_addr; 47 47 48 - dev = container_of(kobj, struct device, kobj); 48 + dev = kobj_to_dev(kobj); 49 49 edev = dev_get_drvdata(dev); 50 50 51 51 cmd_addr = OP_READ << edev->addrlen; ··· 190 190 struct device *dev; 191 191 int i, ret, step = 1; 192 192 193 - dev = container_of(kobj, struct device, kobj); 193 + dev = kobj_to_dev(kobj); 194 194 edev = dev_get_drvdata(dev); 195 195 196 196 /* only write even number of bytes on 16-bit devices */