diff options
author | David Fries <david@fries.net> | 2008-10-16 01:04:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:49 -0400 |
commit | 9141f57c7edd40a48a41b7e31427c4b2831a36af (patch) | |
tree | 7633fdba9c639baa999812a01154ece4762062c6 /drivers/w1/w1_int.c | |
parent | cd7b28d33d0cabdc86fa7d546da07b9385274bbb (diff) |
W1: new module parameter search_count
Added a new module parameter search_count which allows overriding the
default search count. -1 continual, 0 disabled, N that many times.
Signed-off-by: David Fries <david@fries.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/w1/w1_int.c')
-rw-r--r-- | drivers/w1/w1_int.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 9d723efdf915..3fd6e6651fbe 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c | |||
@@ -30,6 +30,8 @@ | |||
30 | #include "w1_int.h" | 30 | #include "w1_int.h" |
31 | 31 | ||
32 | static u32 w1_ids = 1; | 32 | static u32 w1_ids = 1; |
33 | static int w1_search_count = -1; /* Default is continual scan */ | ||
34 | module_param_named(search_count, w1_search_count, int, 0); | ||
33 | 35 | ||
34 | static int w1_enable_pullup = 1; | 36 | static int w1_enable_pullup = 1; |
35 | module_param_named(enable_pullup, w1_enable_pullup, int, 0); | 37 | module_param_named(enable_pullup, w1_enable_pullup, int, 0); |
@@ -62,8 +64,8 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, | |||
62 | dev->initialized = 0; | 64 | dev->initialized = 0; |
63 | dev->id = id; | 65 | dev->id = id; |
64 | dev->slave_ttl = slave_ttl; | 66 | dev->slave_ttl = slave_ttl; |
67 | dev->search_count = w1_search_count; | ||
65 | dev->enable_pullup = w1_enable_pullup; | 68 | dev->enable_pullup = w1_enable_pullup; |
66 | dev->search_count = -1; /* continual scan */ | ||
67 | 69 | ||
68 | /* 1 for w1_process to decrement | 70 | /* 1 for w1_process to decrement |
69 | * 1 for __w1_remove_master_device to decrement | 71 | * 1 for __w1_remove_master_device to decrement |