aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEvgeniy Polyakov <johnpol@2ka.mipt.ru>2005-05-20 14:50:33 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-22 00:43:10 -0400
commit4e470aa9642d49230bcdfbb393cf5a81da333aba (patch)
treeeb4e0f515c3c45236f816532c2bd2ce31ac6cfce /drivers
parentc7b2b2a723174d22a743180d5367f0028226031b (diff)
[PATCH] w1_therm: removed duplicated family id.
We can access family id through w1_family structure. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/w1/w1_therm.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/w1/w1_therm.c b/drivers/w1/w1_therm.c
index b9896c10af6d..165526c9360a 100644
--- a/drivers/w1/w1_therm.c
+++ b/drivers/w1/w1_therm.c
@@ -66,7 +66,6 @@ static struct w1_family w1_therm_family_DS1822 = {
66 66
67struct w1_therm_family_converter 67struct w1_therm_family_converter
68{ 68{
69 u8 fid;
70 u8 broken; 69 u8 broken;
71 u16 reserved; 70 u16 reserved;
72 struct w1_family *f; 71 struct w1_family *f;
@@ -78,17 +77,14 @@ static inline int w1_DS18S20_convert_temp(u8 rom[9]);
78 77
79static struct w1_therm_family_converter w1_therm_families[] = { 78static struct w1_therm_family_converter w1_therm_families[] = {
80 { 79 {
81 .fid = W1_THERM_DS18S20,
82 .f = &w1_therm_family_DS18S20, 80 .f = &w1_therm_family_DS18S20,
83 .convert = w1_DS18S20_convert_temp 81 .convert = w1_DS18S20_convert_temp
84 }, 82 },
85 { 83 {
86 .fid = W1_THERM_DS1822,
87 .f = &w1_therm_family_DS1822, 84 .f = &w1_therm_family_DS1822,
88 .convert = w1_DS18B20_convert_temp 85 .convert = w1_DS18B20_convert_temp
89 }, 86 },
90 { 87 {
91 .fid = W1_THERM_DS18B20,
92 .f = &w1_therm_family_DS18B20, 88 .f = &w1_therm_family_DS18B20,
93 .convert = w1_DS18B20_convert_temp 89 .convert = w1_DS18B20_convert_temp
94 }, 90 },
@@ -133,7 +129,7 @@ static inline int w1_convert_temp(u8 rom[9], u8 fid)
133 int i; 129 int i;
134 130
135 for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i) 131 for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i)
136 if (w1_therm_families[i].fid == fid) 132 if (w1_therm_families[i].f->fid == fid)
137 return w1_therm_families[i].convert(rom); 133 return w1_therm_families[i].convert(rom);
138 134
139 return 0; 135 return 0;