X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fw1%2Fw1_family.c;h=0e32c114f906ecd7688e8f7118becda7f2997233;hb=1ebbe2b20091d306453a5cf480a87e6cd28ae76f;hp=02eee57d3c0cd2c46e394faf1617251944778e42;hpb=a8b3e6f10f08f66ae1072efd087b30966a3654f6;p=linux-2.6

diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index 02eee57d3c..0e32c114f9 100644
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -21,21 +21,14 @@
 
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/sched.h>	/* schedule_timeout() */
 #include <linux/delay.h>
 
 #include "w1_family.h"
+#include "w1.h"
 
 DEFINE_SPINLOCK(w1_flock);
 static LIST_HEAD(w1_families);
-extern void w1_reconnect_slaves(struct w1_family *f);
-
-static int w1_check_family(struct w1_family *f)
-{
-	if (!f->fops->rname || !f->fops->rbin)
-		return -EINVAL;
-
-	return 0;
-}
 
 int w1_register_family(struct w1_family *newf)
 {
@@ -43,9 +36,6 @@ int w1_register_family(struct w1_family *newf)
 	struct w1_family *f;
 	int ret = 0;
 
-	if (w1_check_family(newf))
-		return -EINVAL;
-
 	spin_lock(&w1_flock);
 	list_for_each_safe(ent, n, &w1_families) {
 		f = list_entry(ent, struct w1_family, family_entry);