aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/kernel/ipl.c10
-rw-r--r--drivers/i2c/chips/ds1682.c8
-rw-r--r--drivers/w1/slaves/w1_ds2760.c4
3 files changed, 11 insertions, 11 deletions
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 9a13b24ee1ab..8b8f136d9cc7 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -295,8 +295,8 @@ static ssize_t sys_ipl_device_show(struct kset *kset, char *page)
295static struct subsys_attribute sys_ipl_device_attr = 295static struct subsys_attribute sys_ipl_device_attr =
296 __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL); 296 __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);
297 297
298static ssize_t ipl_parameter_read(struct kobject *kobj, char *buf, loff_t off, 298static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr,
299 size_t count) 299 char *buf, loff_t off, size_t count)
300{ 300{
301 unsigned int size = IPL_PARMBLOCK_SIZE; 301 unsigned int size = IPL_PARMBLOCK_SIZE;
302 302
@@ -317,8 +317,8 @@ static struct bin_attribute ipl_parameter_attr = {
317 .read = &ipl_parameter_read, 317 .read = &ipl_parameter_read,
318}; 318};
319 319
320static ssize_t ipl_scp_data_read(struct kobject *kobj, char *buf, loff_t off, 320static ssize_t ipl_scp_data_read(struct kobject *kobj, struct bin_attribute *attr,
321 size_t count) 321 char *buf, loff_t off, size_t count)
322{ 322{
323 unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len; 323 unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len;
324 void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data; 324 void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data;
@@ -337,7 +337,7 @@ static struct bin_attribute ipl_scp_data_attr = {
337 .mode = S_IRUGO, 337 .mode = S_IRUGO,
338 }, 338 },
339 .size = PAGE_SIZE, 339 .size = PAGE_SIZE,
340 .read = &ipl_scp_data_read, 340 .read = ipl_scp_data_read,
341}; 341};
342 342
343/* FCP ipl device attributes */ 343/* FCP ipl device attributes */
diff --git a/drivers/i2c/chips/ds1682.c b/drivers/i2c/chips/ds1682.c
index 25fd4676fb17..5879f0f25495 100644
--- a/drivers/i2c/chips/ds1682.c
+++ b/drivers/i2c/chips/ds1682.c
@@ -140,8 +140,8 @@ static const struct attribute_group ds1682_group = {
140/* 140/*
141 * User data attribute 141 * User data attribute
142 */ 142 */
143static ssize_t ds1682_eeprom_read(struct kobject *kobj, char *buf, loff_t off, 143static ssize_t ds1682_eeprom_read(struct kobject *kobj, struct bin_attribute *attr,
144 size_t count) 144 char *buf, loff_t off, size_t count)
145{ 145{
146 struct i2c_client *client = kobj_to_i2c_client(kobj); 146 struct i2c_client *client = kobj_to_i2c_client(kobj);
147 int rc; 147 int rc;
@@ -163,8 +163,8 @@ static ssize_t ds1682_eeprom_read(struct kobject *kobj, char *buf, loff_t off,
163 return count; 163 return count;
164} 164}
165 165
166static ssize_t ds1682_eeprom_write(struct kobject *kobj, char *buf, loff_t off, 166static ssize_t ds1682_eeprom_write(struct kobject *kobj, struct bin_attribute *attr,
167 size_t count) 167 char *buf, loff_t off, size_t count)
168{ 168{
169 struct i2c_client *client = kobj_to_i2c_client(kobj); 169 struct i2c_client *client = kobj_to_i2c_client(kobj);
170 170
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c
index 88a37fbccc3f..1f2b1a4d5fb3 100644
--- a/drivers/w1/slaves/w1_ds2760.c
+++ b/drivers/w1/slaves/w1_ds2760.c
@@ -68,8 +68,8 @@ int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count)
68 return w1_ds2760_io(dev, buf, addr, count, 1); 68 return w1_ds2760_io(dev, buf, addr, count, 1);
69} 69}
70 70
71static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off, 71static ssize_t w1_ds2760_read_bin(struct kobject *kobj, struct bin_attribute *attr,
72 size_t count) 72 char *buf, loff_t off, size_t count)
73{ 73{
74 struct device *dev = container_of(kobj, struct device, kobj); 74 struct device *dev = container_of(kobj, struct device, kobj);
75 return w1_ds2760_read(dev, buf, off, count); 75 return w1_ds2760_read(dev, buf, off, count);