summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorDavid Fries <david@fries.net>2008-10-16 09:04:45 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 22:21:49 +0400
commit9141f57c7edd40a48a41b7e31427c4b2831a36af (patch)
tree7633fdba9c639baa999812a01154ece4762062c6 /drivers/w1
parentcd7b28d33d0cabdc86fa7d546da07b9385274bbb (diff)
downloadlinux-9141f57c7edd40a48a41b7e31427c4b2831a36af.tar.xz
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')
-rw-r--r--drivers/w1/w1_int.c4
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 @@
#include "w1_int.h"
static u32 w1_ids = 1;
+static int w1_search_count = -1; /* Default is continual scan */
+module_param_named(search_count, w1_search_count, int, 0);
static int w1_enable_pullup = 1;
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,
dev->initialized = 0;
dev->id = id;
dev->slave_ttl = slave_ttl;
+ dev->search_count = w1_search_count;
dev->enable_pullup = w1_enable_pullup;
- dev->search_count = -1; /* continual scan */
/* 1 for w1_process to decrement
* 1 for __w1_remove_master_device to decrement