missing argument in bin_attribute ->read()/->write()
Fallout from commit 91a6902958
('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>
This commit is contained in:
parent
ececfdee1c
commit
05bd711ea2
3 changed files with 11 additions and 11 deletions
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue