aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1.c
diff options
context:
space:
mode:
authorDavid Fries <david@fries.net>2008-10-16 01:04:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:49 -0400
commit01e14d6db9654be005a0a5384090aea2cde39976 (patch)
tree9db896b843f763a17d97105fbcef597367d50395 /drivers/w1/w1.c
parent0d671b272af9eb06260ab3fd210d454e98dd4216 (diff)
W1: don't delay search start
Move the creation of the w1_process thread to after the device has been initialized. This way w1_process doesn't have to check to see if it has been initialized and the bus search can proceed without sleeping. That also eliminates two checks in the w1_process loop. The sleep now happens at the end of the loop not the beginning. Also added a comment for why the atomic_set was 2. 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.c')
-rw-r--r--drivers/w1/w1.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index aac03f151fe0..730faa49d8dc 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -813,21 +813,14 @@ int w1_process(void *data)
813 struct w1_master *dev = (struct w1_master *) data; 813 struct w1_master *dev = (struct w1_master *) data;
814 814
815 while (!kthread_should_stop() && !test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) { 815 while (!kthread_should_stop() && !test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) {
816 if (dev->search_count) {
817 mutex_lock(&dev->mutex);
818 w1_search_process(dev, W1_SEARCH);
819 mutex_unlock(&dev->mutex);
820 }
821
816 try_to_freeze(); 822 try_to_freeze();
817 msleep_interruptible(w1_timeout * 1000); 823 msleep_interruptible(w1_timeout * 1000);
818
819 if (kthread_should_stop() || test_bit(W1_MASTER_NEED_EXIT, &dev->flags))
820 break;
821
822 if (!dev->initialized)
823 continue;
824
825 if (dev->search_count == 0)
826 continue;
827
828 mutex_lock(&dev->mutex);
829 w1_search_process(dev, W1_SEARCH);
830 mutex_unlock(&dev->mutex);
831 } 824 }
832 825
833 atomic_dec(&dev->refcnt); 826 atomic_dec(&dev->refcnt);