Merge ../to-linus-stable/

[linux-2.6] / drivers / w1 / w1_therm.c

diff --git a/drivers/w1/w1_therm.c b/drivers/w1/w1_therm.c
index e52abca05070841d2bf0cee7f6d306cc78f204b8..165526c9360ad5a99a642e5e91c92ac762b24b0c 100644 (file)
--- a/drivers/w1/w1_therm.c
+++ b/drivers/w1/w1_therm.c
@@ -43,14 +43,11 @@ static u8 bad_roms[][9] = {
                        };
 
 static ssize_t w1_therm_read_name(struct device *, struct device_attribute *attr, char *);
-static ssize_t w1_therm_read_temp(struct device *, struct device_attribute *attr, char *);
 static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t);
 
 static struct w1_family_ops w1_therm_fops = {
        .rname = &w1_therm_read_name,
        .rbin = &w1_therm_read_bin,
-       .rval = &w1_therm_read_temp,
-       .rvalname = "temp1_input",
 };
 
 static struct w1_family w1_therm_family_DS18S20 = {
@@ -69,7 +66,6 @@ static struct w1_family w1_therm_family_DS1822 = {
 
 struct w1_therm_family_converter
 {
-       u8                      fid;
        u8                      broken;
        u16                     reserved;
        struct w1_family        *f;
@@ -81,17 +77,14 @@ static inline int w1_DS18S20_convert_temp(u8 rom[9]);
 
 static struct w1_therm_family_converter w1_therm_families[] = {
        {
-               .fid            = W1_THERM_DS18S20,
                .f              = &w1_therm_family_DS18S20,
                .convert        = w1_DS18S20_convert_temp
        },
        {
-               .fid            = W1_THERM_DS1822,
                .f              = &w1_therm_family_DS1822,
                .convert        = w1_DS18B20_convert_temp
        },
        {
-               .fid            = W1_THERM_DS18B20,
                .f              = &w1_therm_family_DS18B20,
                .convert        = w1_DS18B20_convert_temp
        },
@@ -136,19 +129,12 @@ static inline int w1_convert_temp(u8 rom[9], u8 fid)
        int i;
 
        for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i)
-               if (w1_therm_families[i].fid == fid)
+               if (w1_therm_families[i].f->fid == fid)
                        return w1_therm_families[i].convert(rom);
 
        return 0;
 }
 
-static ssize_t w1_therm_read_temp(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-
-       return sprintf(buf, "%d\n", w1_convert_temp(sl->rom, sl->family->fid));
-}
-
 static int w1_therm_check_rom(u8 rom[9])
 {
        int i;