提交 05bd711e 编写于 作者: A Al Viro 提交者: Linus Torvalds

missing argument in bin_attribute ->read()/->write()

Fallout from commit 91a69029 ('sysfs:
add parameter "struct bin_attribute *" ...')
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 ececfdee
...@@ -295,8 +295,8 @@ static ssize_t sys_ipl_device_show(struct kset *kset, char *page) ...@@ -295,8 +295,8 @@ static ssize_t sys_ipl_device_show(struct kset *kset, char *page)
static struct subsys_attribute sys_ipl_device_attr = static struct subsys_attribute sys_ipl_device_attr =
__ATTR(device, S_IRUGO, sys_ipl_device_show, NULL); __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);
static ssize_t ipl_parameter_read(struct kobject *kobj, char *buf, loff_t off, static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr,
size_t count) char *buf, loff_t off, size_t count)
{ {
unsigned int size = IPL_PARMBLOCK_SIZE; unsigned int size = IPL_PARMBLOCK_SIZE;
...@@ -317,8 +317,8 @@ static struct bin_attribute ipl_parameter_attr = { ...@@ -317,8 +317,8 @@ static struct bin_attribute ipl_parameter_attr = {
.read = &ipl_parameter_read, .read = &ipl_parameter_read,
}; };
static ssize_t ipl_scp_data_read(struct kobject *kobj, char *buf, loff_t off, static ssize_t ipl_scp_data_read(struct kobject *kobj, struct bin_attribute *attr,
size_t count) char *buf, loff_t off, size_t count)
{ {
unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len; unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len;
void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data; void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data;
...@@ -337,7 +337,7 @@ static struct bin_attribute ipl_scp_data_attr = { ...@@ -337,7 +337,7 @@ static struct bin_attribute ipl_scp_data_attr = {
.mode = S_IRUGO, .mode = S_IRUGO,
}, },
.size = PAGE_SIZE, .size = PAGE_SIZE,
.read = &ipl_scp_data_read, .read = ipl_scp_data_read,
}; };
/* FCP ipl device attributes */ /* FCP ipl device attributes */
......
...@@ -140,8 +140,8 @@ static const struct attribute_group ds1682_group = { ...@@ -140,8 +140,8 @@ static const struct attribute_group ds1682_group = {
/* /*
* User data attribute * User data attribute
*/ */
static ssize_t ds1682_eeprom_read(struct kobject *kobj, char *buf, loff_t off, static ssize_t ds1682_eeprom_read(struct kobject *kobj, struct bin_attribute *attr,
size_t count) char *buf, loff_t off, size_t count)
{ {
struct i2c_client *client = kobj_to_i2c_client(kobj); struct i2c_client *client = kobj_to_i2c_client(kobj);
int rc; int rc;
...@@ -163,8 +163,8 @@ static ssize_t ds1682_eeprom_read(struct kobject *kobj, char *buf, loff_t off, ...@@ -163,8 +163,8 @@ static ssize_t ds1682_eeprom_read(struct kobject *kobj, char *buf, loff_t off,
return count; return count;
} }
static ssize_t ds1682_eeprom_write(struct kobject *kobj, char *buf, loff_t off, static ssize_t ds1682_eeprom_write(struct kobject *kobj, struct bin_attribute *attr,
size_t count) char *buf, loff_t off, size_t count)
{ {
struct i2c_client *client = kobj_to_i2c_client(kobj); struct i2c_client *client = kobj_to_i2c_client(kobj);
......
...@@ -68,8 +68,8 @@ int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count) ...@@ -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); return w1_ds2760_io(dev, buf, addr, count, 1);
} }
static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off, static ssize_t w1_ds2760_read_bin(struct kobject *kobj, struct bin_attribute *attr,
size_t count) char *buf, loff_t off, size_t count)
{ {
struct device *dev = container_of(kobj, struct device, kobj); struct device *dev = container_of(kobj, struct device, kobj);
return w1_ds2760_read(dev, buf, off, count); return w1_ds2760_read(dev, buf, off, count);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册