diff options
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/chips/eeprom.c | 4 | ||||
-rw-r--r-- | drivers/i2c/chips/max6875.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c index 48f857ae8748..d3da1fb05b9b 100644 --- a/drivers/i2c/chips/eeprom.c +++ b/drivers/i2c/chips/eeprom.c | |||
@@ -112,7 +112,8 @@ exit: | |||
112 | mutex_unlock(&data->update_lock); | 112 | mutex_unlock(&data->update_lock); |
113 | } | 113 | } |
114 | 114 | ||
115 | static ssize_t eeprom_read(struct kobject *kobj, char *buf, loff_t off, size_t count) | 115 | static ssize_t eeprom_read(struct kobject *kobj, struct bin_attribute *bin_attr, |
116 | char *buf, loff_t off, size_t count) | ||
116 | { | 117 | { |
117 | struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj)); | 118 | struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj)); |
118 | struct eeprom_data *data = i2c_get_clientdata(client); | 119 | struct eeprom_data *data = i2c_get_clientdata(client); |
@@ -145,7 +146,6 @@ static struct bin_attribute eeprom_attr = { | |||
145 | .attr = { | 146 | .attr = { |
146 | .name = "eeprom", | 147 | .name = "eeprom", |
147 | .mode = S_IRUGO, | 148 | .mode = S_IRUGO, |
148 | .owner = THIS_MODULE, | ||
149 | }, | 149 | }, |
150 | .size = EEPROM_SIZE, | 150 | .size = EEPROM_SIZE, |
151 | .read = eeprom_read, | 151 | .read = eeprom_read, |
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c index e9e9e5171b53..64692f666372 100644 --- a/drivers/i2c/chips/max6875.c +++ b/drivers/i2c/chips/max6875.c | |||
@@ -126,8 +126,9 @@ exit_up: | |||
126 | mutex_unlock(&data->update_lock); | 126 | mutex_unlock(&data->update_lock); |
127 | } | 127 | } |
128 | 128 | ||
129 | static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off, | 129 | static ssize_t max6875_read(struct kobject *kobj, |
130 | size_t count) | 130 | struct bin_attribute *bin_attr, |
131 | char *buf, loff_t off, size_t count) | ||
131 | { | 132 | { |
132 | struct i2c_client *client = kobj_to_i2c_client(kobj); | 133 | struct i2c_client *client = kobj_to_i2c_client(kobj); |
133 | struct max6875_data *data = i2c_get_clientdata(client); | 134 | struct max6875_data *data = i2c_get_clientdata(client); |
@@ -153,7 +154,6 @@ static struct bin_attribute user_eeprom_attr = { | |||
153 | .attr = { | 154 | .attr = { |
154 | .name = "eeprom", | 155 | .name = "eeprom", |
155 | .mode = S_IRUGO, | 156 | .mode = S_IRUGO, |
156 | .owner = THIS_MODULE, | ||
157 | }, | 157 | }, |
158 | .size = USER_EEPROM_SIZE, | 158 | .size = USER_EEPROM_SIZE, |
159 | .read = max6875_read, | 159 | .read = max6875_read, |