aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBhaktipriya Shridhar <bhaktipriya96@gmail.com>2016-07-16 04:55:56 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-08-24 08:30:21 -0400
commit53eebd84c3ac2a81da94535594dba6ff637311dd (patch)
tree9fb9da06aff94efe243344aebac11d319bdad7a4
parente59646895778f1e645b4e2f02d99aaec7a144ce1 (diff)
[media] gspca: finepix: Remove deprecated create_singlethread_workqueue
The workqueue "work_thread" is involved in streaming the camera data. It has a single work item(&dev->work_struct) and hence doesn't require ordering. Also, it is not being used on a memory reclaim path. Hence, the singlethreaded workqueue has been replaced with the use of system_wq. System workqueues have been able to handle high level of concurrency for a long time now and hence it's not required to have a singlethreaded workqueue just to gain concurrency. Unlike a dedicated per-cpu workqueue created with create_singlethread_workqueue(), system_wq allows multiple work items to overlap executions even on the same CPU; however, a per-cpu workqueue doesn't have any CPU locality or global ordering guarantee unless the target CPU is explicitly specified and thus the increase of local concurrency shouldn't make any difference. Work item has been flushed in sd_stop0() to ensure that there are no pending tasks while disconnecting the driver. Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com> Acked-by: Tejun Heo <tj@kernel.org> Acked-by: Frank Zago <frank@zago.net> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/usb/gspca/finepix.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/usb/gspca/finepix.c b/drivers/media/usb/gspca/finepix.c
index 52bdb569760b..ae9a55d7bbbb 100644
--- a/drivers/media/usb/gspca/finepix.c
+++ b/drivers/media/usb/gspca/finepix.c
@@ -41,7 +41,6 @@ struct usb_fpix {
41 struct gspca_dev gspca_dev; /* !! must be the first item */ 41 struct gspca_dev gspca_dev; /* !! must be the first item */
42 42
43 struct work_struct work_struct; 43 struct work_struct work_struct;
44 struct workqueue_struct *work_thread;
45}; 44};
46 45
47/* Delay after which claim the next frame. If the delay is too small, 46/* Delay after which claim the next frame. If the delay is too small,
@@ -226,9 +225,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
226 /* Again, reset bulk in endpoint */ 225 /* Again, reset bulk in endpoint */
227 usb_clear_halt(gspca_dev->dev, gspca_dev->urb[0]->pipe); 226 usb_clear_halt(gspca_dev->dev, gspca_dev->urb[0]->pipe);
228 227
229 /* Start the workqueue function to do the streaming */ 228 schedule_work(&dev->work_struct);
230 dev->work_thread = create_singlethread_workqueue(MODULE_NAME);
231 queue_work(dev->work_thread, &dev->work_struct);
232 229
233 return 0; 230 return 0;
234} 231}
@@ -241,9 +238,8 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
241 238
242 /* wait for the work queue to terminate */ 239 /* wait for the work queue to terminate */
243 mutex_unlock(&gspca_dev->usb_lock); 240 mutex_unlock(&gspca_dev->usb_lock);
244 destroy_workqueue(dev->work_thread); 241 flush_work(&dev->work_struct);
245 mutex_lock(&gspca_dev->usb_lock); 242 mutex_lock(&gspca_dev->usb_lock);
246 dev->work_thread = NULL;
247} 243}
248 244
249/* Table of supported USB devices */ 245/* Table of supported USB devices */