aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBhaktipriya Shridhar <bhaktipriya96@gmail.com>2016-07-16 04:52:19 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-08-24 08:29:35 -0400
commit9570508386eeb192d3803a1ae4be16870f40a57f (patch)
tree9c3aeef86904295419d7f2bbf667c69e58ca6938
parentc994be4a7c8471b950ed9baf4558ff488b127ec8 (diff)
[media] gspca: vicam: Remove deprecated create_singlethread_workqueue
The workqueue "work_thread" is involved in streaming the camera data. It has a single work item(&sd->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> 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/vicam.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/usb/gspca/vicam.c b/drivers/media/usb/gspca/vicam.c
index 103f6c4236b0..8860510c2f9c 100644
--- a/drivers/media/usb/gspca/vicam.c
+++ b/drivers/media/usb/gspca/vicam.c
@@ -47,7 +47,6 @@ MODULE_FIRMWARE(VICAM_FIRMWARE);
47struct sd { 47struct sd {
48 struct gspca_dev gspca_dev; /* !! must be the first item */ 48 struct gspca_dev gspca_dev; /* !! must be the first item */
49 struct work_struct work_struct; 49 struct work_struct work_struct;
50 struct workqueue_struct *work_thread;
51}; 50};
52 51
53/* The vicam sensor has a resolution of 512 x 244, with I believe square 52/* The vicam sensor has a resolution of 512 x 244, with I believe square
@@ -278,9 +277,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
278 if (ret < 0) 277 if (ret < 0)
279 return ret; 278 return ret;
280 279
281 /* Start the workqueue function to do the streaming */ 280 schedule_work(&sd->work_struct);
282 sd->work_thread = create_singlethread_workqueue(MODULE_NAME);
283 queue_work(sd->work_thread, &sd->work_struct);
284 281
285 return 0; 282 return 0;
286} 283}
@@ -294,8 +291,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
294 /* wait for the work queue to terminate */ 291 /* wait for the work queue to terminate */
295 mutex_unlock(&gspca_dev->usb_lock); 292 mutex_unlock(&gspca_dev->usb_lock);
296 /* This waits for vicam_dostream to finish */ 293 /* This waits for vicam_dostream to finish */
297 destroy_workqueue(dev->work_thread); 294 flush_work(&dev->work_struct);
298 dev->work_thread = NULL;
299 mutex_lock(&gspca_dev->usb_lock); 295 mutex_lock(&gspca_dev->usb_lock);
300 296
301 if (gspca_dev->present) 297 if (gspca_dev->present)