diff options
author | Geliang Tang <geliangtang@163.com> | 2016-01-13 10:30:11 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-08 02:01:45 -0500 |
commit | 092462c2b52259edba80a6748acb3305f7f70423 (patch) | |
tree | b86f9014d3cce56618ab39b21337487f88cbd55c /drivers/misc/eeprom | |
parent | 8c99d8e6de0474bf5a7004e41c044ac4dcacbae1 (diff) |
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>
Diffstat (limited to 'drivers/misc/eeprom')
-rw-r--r-- | drivers/misc/eeprom/at24.c | 4 | ||||
-rw-r--r-- | drivers/misc/eeprom/at25.c | 4 | ||||
-rw-r--r-- | drivers/misc/eeprom/eeprom.c | 2 | ||||
-rw-r--r-- | drivers/misc/eeprom/eeprom_93xx46.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 5d7c0900fa1b..d105c2564400 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c | |||
@@ -289,7 +289,7 @@ static ssize_t at24_bin_read(struct file *filp, struct kobject *kobj, | |||
289 | { | 289 | { |
290 | struct at24_data *at24; | 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 | return at24_read(at24, buf, off, count); | 293 | return at24_read(at24, buf, off, count); |
294 | } | 294 | } |
295 | 295 | ||
@@ -420,7 +420,7 @@ static ssize_t at24_bin_write(struct file *filp, struct kobject *kobj, | |||
420 | { | 420 | { |
421 | struct at24_data *at24; | 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 | return at24_write(at24, buf, off, count); | 424 | return at24_write(at24, buf, off, count); |
425 | } | 425 | } |
426 | 426 | ||
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c index f850ef556bcc..3e9e5a28acaa 100644 --- a/drivers/misc/eeprom/at25.c +++ b/drivers/misc/eeprom/at25.c | |||
@@ -139,7 +139,7 @@ at25_bin_read(struct file *filp, struct kobject *kobj, | |||
139 | struct device *dev; | 139 | struct device *dev; |
140 | struct at25_data *at25; | 140 | struct at25_data *at25; |
141 | 141 | ||
142 | dev = container_of(kobj, struct device, kobj); | 142 | dev = kobj_to_dev(kobj); |
143 | at25 = dev_get_drvdata(dev); | 143 | at25 = dev_get_drvdata(dev); |
144 | 144 | ||
145 | return at25_ee_read(at25, buf, off, count); | 145 | return at25_ee_read(at25, buf, off, count); |
@@ -273,7 +273,7 @@ at25_bin_write(struct file *filp, struct kobject *kobj, | |||
273 | struct device *dev; | 273 | struct device *dev; |
274 | struct at25_data *at25; | 274 | struct at25_data *at25; |
275 | 275 | ||
276 | dev = container_of(kobj, struct device, kobj); | 276 | dev = kobj_to_dev(kobj); |
277 | at25 = dev_get_drvdata(dev); | 277 | at25 = dev_get_drvdata(dev); |
278 | 278 | ||
279 | return at25_ee_write(at25, buf, off, count); | 279 | return at25_ee_write(at25, buf, off, count); |
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c index 7342fd637031..3d1d55157e5f 100644 --- a/drivers/misc/eeprom/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c | |||
@@ -84,7 +84,7 @@ static ssize_t eeprom_read(struct file *filp, struct kobject *kobj, | |||
84 | struct bin_attribute *bin_attr, | 84 | struct bin_attribute *bin_attr, |
85 | char *buf, loff_t off, size_t count) | 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 | struct eeprom_data *data = i2c_get_clientdata(client); | 88 | struct eeprom_data *data = i2c_get_clientdata(client); |
89 | u8 slice; | 89 | u8 slice; |
90 | 90 | ||
diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c index ff63f05edc76..473aa0a2eaf6 100644 --- a/drivers/misc/eeprom/eeprom_93xx46.c +++ b/drivers/misc/eeprom/eeprom_93xx46.c | |||
@@ -45,7 +45,7 @@ eeprom_93xx46_bin_read(struct file *filp, struct kobject *kobj, | |||
45 | int bits, ret; | 45 | int bits, ret; |
46 | u16 cmd_addr; | 46 | u16 cmd_addr; |
47 | 47 | ||
48 | dev = container_of(kobj, struct device, kobj); | 48 | dev = kobj_to_dev(kobj); |
49 | edev = dev_get_drvdata(dev); | 49 | edev = dev_get_drvdata(dev); |
50 | 50 | ||
51 | cmd_addr = OP_READ << edev->addrlen; | 51 | cmd_addr = OP_READ << edev->addrlen; |
@@ -190,7 +190,7 @@ eeprom_93xx46_bin_write(struct file *filp, struct kobject *kobj, | |||
190 | struct device *dev; | 190 | struct device *dev; |
191 | int i, ret, step = 1; | 191 | int i, ret, step = 1; |
192 | 192 | ||
193 | dev = container_of(kobj, struct device, kobj); | 193 | dev = kobj_to_dev(kobj); |
194 | edev = dev_get_drvdata(dev); | 194 | edev = dev_get_drvdata(dev); |
195 | 195 | ||
196 | /* only write even number of bytes on 16-bit devices */ | 196 | /* only write even number of bytes on 16-bit devices */ |