diff options
Diffstat (limited to 'drivers/w1/w1_therm.c')
-rw-r--r-- | drivers/w1/w1_therm.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/w1/w1_therm.c b/drivers/w1/w1_therm.c index e52abca05070..b9896c10af6d 100644 --- a/drivers/w1/w1_therm.c +++ b/drivers/w1/w1_therm.c | |||
@@ -43,14 +43,11 @@ static u8 bad_roms[][9] = { | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | static ssize_t w1_therm_read_name(struct device *, struct device_attribute *attr, 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 *, struct device_attribute *attr, char *); | ||
47 | static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t); | 46 | static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t); |
48 | 47 | ||
49 | static struct w1_family_ops w1_therm_fops = { | 48 | static struct w1_family_ops w1_therm_fops = { |
50 | .rname = &w1_therm_read_name, | 49 | .rname = &w1_therm_read_name, |
51 | .rbin = &w1_therm_read_bin, | 50 | .rbin = &w1_therm_read_bin, |
52 | .rval = &w1_therm_read_temp, | ||
53 | .rvalname = "temp1_input", | ||
54 | }; | 51 | }; |
55 | 52 | ||
56 | static struct w1_family w1_therm_family_DS18S20 = { | 53 | static struct w1_family w1_therm_family_DS18S20 = { |
@@ -142,13 +139,6 @@ static inline int w1_convert_temp(u8 rom[9], u8 fid) | |||
142 | return 0; | 139 | return 0; |
143 | } | 140 | } |
144 | 141 | ||
145 | static ssize_t w1_therm_read_temp(struct device *dev, struct device_attribute *attr, char *buf) | ||
146 | { | ||
147 | struct w1_slave *sl = container_of(dev, struct w1_slave, dev); | ||
148 | |||
149 | return sprintf(buf, "%d\n", w1_convert_temp(sl->rom, sl->family->fid)); | ||
150 | } | ||
151 | |||
152 | static int w1_therm_check_rom(u8 rom[9]) | 142 | static int w1_therm_check_rom(u8 rom[9]) |
153 | { | 143 | { |
154 | int i; | 144 | int i; |