diff options
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/slaves/w1_ds2431.c | 4 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_ds2433.c | 4 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_ds2760.c | 2 | ||||
| -rw-r--r-- | drivers/w1/w1.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/w1/slaves/w1_ds2431.c b/drivers/w1/slaves/w1_ds2431.c index 2c6c0cf6a20f..84e2410aec1d 100644 --- a/drivers/w1/slaves/w1_ds2431.c +++ b/drivers/w1/slaves/w1_ds2431.c | |||
| @@ -96,7 +96,7 @@ static int w1_f2d_readblock(struct w1_slave *sl, int off, int count, char *buf) | |||
| 96 | return -1; | 96 | return -1; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | static ssize_t w1_f2d_read_bin(struct kobject *kobj, | 99 | static ssize_t w1_f2d_read_bin(struct file *filp, struct kobject *kobj, |
| 100 | struct bin_attribute *bin_attr, | 100 | struct bin_attribute *bin_attr, |
| 101 | char *buf, loff_t off, size_t count) | 101 | char *buf, loff_t off, size_t count) |
| 102 | { | 102 | { |
| @@ -202,7 +202,7 @@ retry: | |||
| 202 | return 0; | 202 | return 0; |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | static ssize_t w1_f2d_write_bin(struct kobject *kobj, | 205 | static ssize_t w1_f2d_write_bin(struct file *filp, struct kobject *kobj, |
| 206 | struct bin_attribute *bin_attr, | 206 | struct bin_attribute *bin_attr, |
| 207 | char *buf, loff_t off, size_t count) | 207 | char *buf, loff_t off, size_t count) |
| 208 | { | 208 | { |
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index d2bf32118a98..0f7b8f9c509a 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c | |||
| @@ -92,7 +92,7 @@ static int w1_f23_refresh_block(struct w1_slave *sl, struct w1_f23_data *data, | |||
| 92 | } | 92 | } |
| 93 | #endif /* CONFIG_W1_SLAVE_DS2433_CRC */ | 93 | #endif /* CONFIG_W1_SLAVE_DS2433_CRC */ |
| 94 | 94 | ||
| 95 | static ssize_t w1_f23_read_bin(struct kobject *kobj, | 95 | static ssize_t w1_f23_read_bin(struct file *filp, struct kobject *kobj, |
| 96 | struct bin_attribute *bin_attr, | 96 | struct bin_attribute *bin_attr, |
| 97 | char *buf, loff_t off, size_t count) | 97 | char *buf, loff_t off, size_t count) |
| 98 | { | 98 | { |
| @@ -206,7 +206,7 @@ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data) | |||
| 206 | return 0; | 206 | return 0; |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | static ssize_t w1_f23_write_bin(struct kobject *kobj, | 209 | static ssize_t w1_f23_write_bin(struct file *filp, struct kobject *kobj, |
| 210 | struct bin_attribute *bin_attr, | 210 | struct bin_attribute *bin_attr, |
| 211 | char *buf, loff_t off, size_t count) | 211 | char *buf, loff_t off, size_t count) |
| 212 | { | 212 | { |
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c index 6e153343e117..483d45180911 100644 --- a/drivers/w1/slaves/w1_ds2760.c +++ b/drivers/w1/slaves/w1_ds2760.c | |||
| @@ -97,7 +97,7 @@ int w1_ds2760_recall_eeprom(struct device *dev, int addr) | |||
| 97 | return w1_ds2760_eeprom_cmd(dev, addr, W1_DS2760_RECALL_DATA); | 97 | return w1_ds2760_eeprom_cmd(dev, addr, W1_DS2760_RECALL_DATA); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | static ssize_t w1_ds2760_read_bin(struct kobject *kobj, | 100 | static ssize_t w1_ds2760_read_bin(struct file *filp, struct kobject *kobj, |
| 101 | struct bin_attribute *bin_attr, | 101 | struct bin_attribute *bin_attr, |
| 102 | char *buf, loff_t off, size_t count) | 102 | char *buf, loff_t off, size_t count) |
| 103 | { | 103 | { |
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index ad5897dc4495..2839e281cd65 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c | |||
| @@ -120,7 +120,7 @@ static struct device_attribute w1_slave_attr_id = | |||
| 120 | 120 | ||
| 121 | /* Default family */ | 121 | /* Default family */ |
| 122 | 122 | ||
| 123 | static ssize_t w1_default_write(struct kobject *kobj, | 123 | static ssize_t w1_default_write(struct file *filp, struct kobject *kobj, |
| 124 | struct bin_attribute *bin_attr, | 124 | struct bin_attribute *bin_attr, |
| 125 | char *buf, loff_t off, size_t count) | 125 | char *buf, loff_t off, size_t count) |
| 126 | { | 126 | { |
| @@ -139,7 +139,7 @@ out_up: | |||
| 139 | return count; | 139 | return count; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | static ssize_t w1_default_read(struct kobject *kobj, | 142 | static ssize_t w1_default_read(struct file *filp, struct kobject *kobj, |
| 143 | struct bin_attribute *bin_attr, | 143 | struct bin_attribute *bin_attr, |
| 144 | char *buf, loff_t off, size_t count) | 144 | char *buf, loff_t off, size_t count) |
| 145 | { | 145 | { |