diff options
author | Yani Ioannou <yani.ioannou@gmail.com> | 2005-05-17 06:44:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 18:15:35 -0400 |
commit | 060b8845e6bea938d65ad6f89e83507e5ff4fec4 (patch) | |
tree | ba82ce7d7a532b045f02e29788ece53d6be693e6 /drivers/w1/w1_therm.c | |
parent | 10523b3b82456e416cbaffcc24ea2246980aa746 (diff) |
[PATCH] Driver Core: drivers/usb/input/aiptek.c - drivers/zorro/zorro-sysfs.c: update device attribute callbacks
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/w1/w1_therm.c')
-rw-r--r-- | drivers/w1/w1_therm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/w1/w1_therm.c b/drivers/w1/w1_therm.c index 0b1817890503..70310f7a722e 100644 --- a/drivers/w1/w1_therm.c +++ b/drivers/w1/w1_therm.c | |||
@@ -42,8 +42,8 @@ static u8 bad_roms[][9] = { | |||
42 | {} | 42 | {} |
43 | }; | 43 | }; |
44 | 44 | ||
45 | static ssize_t w1_therm_read_name(struct device *, char *); | 45 | static ssize_t w1_therm_read_name(struct device *, struct device_attribute *attr, char *); |
46 | static ssize_t w1_therm_read_temp(struct device *, char *); | 46 | static ssize_t w1_therm_read_temp(struct device *, struct device_attribute *attr, char *); |
47 | static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t); | 47 | static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t); |
48 | 48 | ||
49 | static struct w1_family_ops w1_therm_fops = { | 49 | static struct w1_family_ops w1_therm_fops = { |
@@ -53,7 +53,7 @@ static struct w1_family_ops w1_therm_fops = { | |||
53 | .rvalname = "temp1_input", | 53 | .rvalname = "temp1_input", |
54 | }; | 54 | }; |
55 | 55 | ||
56 | static ssize_t w1_therm_read_name(struct device *dev, char *buf) | 56 | static ssize_t w1_therm_read_name(struct device *dev, struct device_attribute *attr, char *buf) |
57 | { | 57 | { |
58 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); | 58 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); |
59 | 59 | ||
@@ -77,7 +77,7 @@ static inline int w1_convert_temp(u8 rom[9]) | |||
77 | return t; | 77 | return t; |
78 | } | 78 | } |
79 | 79 | ||
80 | static ssize_t w1_therm_read_temp(struct device *dev, char *buf) | 80 | static ssize_t w1_therm_read_temp(struct device *dev, struct device_attribute *attr, char *buf) |
81 | { | 81 | { |
82 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); | 82 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); |
83 | 83 | ||