[PATCH] w1_therm: removed duplicated family id.
We can access family id through w1_family structure.
Signed-off-by: Evgeniy Polyakov <[email protected]>
---
commit 4e470aa9642d49230bcdfbb393cf5a81da333aba
tree eb4e0f515c3c45236f816532c2bd2ce31ac6cfce
parent c7b2b2a723174d22a743180d5367f0028226031b
author Evgeniy Polyakov <[email protected]> Fri, 20 May 2005 22:50:33 +0400
committer Greg Kroah-Hartman <[email protected]> Tue, 21 Jun 2005 21:43:10 -0700
drivers/w1/w1_therm.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/w1/w1_therm.c b/drivers/w1/w1_therm.c
--- a/drivers/w1/w1_therm.c
+++ b/drivers/w1/w1_therm.c
@@ -66,7 +66,6 @@ static struct w1_family w1_therm_family_
struct w1_therm_family_converter
{
- u8 fid;
u8 broken;
u16 reserved;
struct w1_family *f;
@@ -78,17 +77,14 @@ static inline int w1_DS18S20_convert_tem
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
},
@@ -133,7 +129,7 @@ static inline int w1_convert_temp(u8 rom
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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
