aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1_int.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_int.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_int.c')
-rw-r--r--drivers/w1/w1_int.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index ed3228017dad..36ff40250b61 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -61,6 +61,9 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
61 dev->slave_ttl = slave_ttl; 61 dev->slave_ttl = slave_ttl;
62 dev->search_count = -1; /* continual scan */ 62 dev->search_count = -1; /* continual scan */
63 63
64 /* 1 for w1_process to decrement
65 * 1 for __w1_remove_master_device to decrement
66 */
64 atomic_set(&dev->refcnt, 2); 67 atomic_set(&dev->refcnt, 2);
65 68
66 INIT_LIST_HEAD(&dev->slist); 69 INIT_LIST_HEAD(&dev->slist);
@@ -109,23 +112,23 @@ int w1_add_master_device(struct w1_bus_master *master)
109 if (!dev) 112 if (!dev)
110 return -ENOMEM; 113 return -ENOMEM;
111 114
115 retval = w1_create_master_attributes(dev);
116 if (retval)
117 goto err_out_free_dev;
118
119 memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
120
121 dev->initialized = 1;
122
112 dev->thread = kthread_run(&w1_process, dev, "%s", dev->name); 123 dev->thread = kthread_run(&w1_process, dev, "%s", dev->name);
113 if (IS_ERR(dev->thread)) { 124 if (IS_ERR(dev->thread)) {
114 retval = PTR_ERR(dev->thread); 125 retval = PTR_ERR(dev->thread);
115 dev_err(&dev->dev, 126 dev_err(&dev->dev,
116 "Failed to create new kernel thread. err=%d\n", 127 "Failed to create new kernel thread. err=%d\n",
117 retval); 128 retval);
118 goto err_out_free_dev; 129 goto err_out_rm_attr;
119 } 130 }
120 131
121 retval = w1_create_master_attributes(dev);
122 if (retval)
123 goto err_out_kill_thread;
124
125 memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
126
127 dev->initialized = 1;
128
129 mutex_lock(&w1_mlock); 132 mutex_lock(&w1_mlock);
130 list_add(&dev->w1_master_entry, &w1_masters); 133 list_add(&dev->w1_master_entry, &w1_masters);
131 mutex_unlock(&w1_mlock); 134 mutex_unlock(&w1_mlock);
@@ -137,8 +140,13 @@ int w1_add_master_device(struct w1_bus_master *master)
137 140
138 return 0; 141 return 0;
139 142
143#if 0 /* Thread cleanup code, not required currently. */
140err_out_kill_thread: 144err_out_kill_thread:
145 set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
141 kthread_stop(dev->thread); 146 kthread_stop(dev->thread);
147#endif
148err_out_rm_attr:
149 w1_destroy_master_attributes(dev);
142err_out_free_dev: 150err_out_free_dev:
143 w1_free_dev(dev); 151 w1_free_dev(dev);
144 152