diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-07-15 21:01:22 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 16:40:52 -0700 |
commit | 05bd711ea2862cb1c754903326b7858bc700b2e9 (patch) | |
tree | aec7cdf2fee4576ff2563090ba8907bc10a68713 | |
parent | ececfdee1cc287123149c801af201e41c7c3cc84 (diff) | |
download | linux-05bd711ea2862cb1c754903326b7858bc700b2e9.tar.bz2 |
missing argument in bin_attribute ->read()/->write()
Fallout from commit 91a6902958f052358899f58683d44e36228d85c2 ('sysfs:
add parameter "struct bin_attribute *" ...')
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/s390/kernel/ipl.c | 10 | ||||
-rw-r--r-- | drivers/i2c/chips/ds1682.c | 8 | ||||
-rw-r--r-- | drivers/w1/slaves/w1_ds2760.c | 4 |
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) static struct subsys_attribute sys_ipl_device_attr = __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL); -static ssize_t ipl_parameter_read(struct kobject *kobj, char *buf, loff_t off, - size_t count) +static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr, + char *buf, loff_t off, size_t count) { unsigned int size = IPL_PARMBLOCK_SIZE; @@ -317,8 +317,8 @@ static struct bin_attribute ipl_parameter_attr = { .read = &ipl_parameter_read, }; -static ssize_t ipl_scp_data_read(struct kobject *kobj, char *buf, loff_t off, - size_t count) +static ssize_t ipl_scp_data_read(struct kobject *kobj, struct bin_attribute *attr, + char *buf, loff_t off, size_t count) { unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len; void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data; @@ -337,7 +337,7 @@ static struct bin_attribute ipl_scp_data_attr = { .mode = S_IRUGO, }, .size = PAGE_SIZE, - .read = &ipl_scp_data_read, + .read = ipl_scp_data_read, }; /* 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 = { /* * User data attribute */ -static ssize_t ds1682_eeprom_read(struct kobject *kobj, char *buf, loff_t off, - size_t count) +static ssize_t ds1682_eeprom_read(struct kobject *kobj, struct bin_attribute *attr, + char *buf, loff_t off, size_t count) { struct i2c_client *client = kobj_to_i2c_client(kobj); int rc; @@ -163,8 +163,8 @@ static ssize_t ds1682_eeprom_read(struct kobject *kobj, char *buf, loff_t off, return count; } -static ssize_t ds1682_eeprom_write(struct kobject *kobj, char *buf, loff_t off, - size_t count) +static ssize_t ds1682_eeprom_write(struct kobject *kobj, struct bin_attribute *attr, + char *buf, loff_t off, size_t count) { struct i2c_client *client = kobj_to_i2c_client(kobj); 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) return w1_ds2760_io(dev, buf, addr, count, 1); } -static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off, - size_t count) +static ssize_t w1_ds2760_read_bin(struct kobject *kobj, struct bin_attribute *attr, + char *buf, loff_t off, size_t count) { struct device *dev = container_of(kobj, struct device, kobj); return w1_ds2760_read(dev, buf, off, count); |