Commit c994be4a authored by Bhaktipriya Shridhar's avatar Bhaktipriya Shridhar Committed by Mauro Carvalho Chehab

[media] gspca: sonixj: Remove deprecated create_singlethread_workqueue

The workqueue "work_thread" is involved in updating the JPEG quality
of the gspca_dev. It has a single work item(&sd->work) 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: default avatarBhaktipriya Shridhar <bhaktipriya96@gmail.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 29a3006e
...@@ -54,7 +54,6 @@ struct sd { ...@@ -54,7 +54,6 @@ struct sd {
u32 exposure; u32 exposure;
struct work_struct work; struct work_struct work;
struct workqueue_struct *work_thread;
u32 pktsz; /* (used by pkt_scan) */ u32 pktsz; /* (used by pkt_scan) */
u16 npkt; u16 npkt;
...@@ -2485,7 +2484,6 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -2485,7 +2484,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
sd->pktsz = sd->npkt = 0; sd->pktsz = sd->npkt = 0;
sd->nchg = sd->short_mark = 0; sd->nchg = sd->short_mark = 0;
sd->work_thread = create_singlethread_workqueue(MODULE_NAME);
return gspca_dev->usb_err; return gspca_dev->usb_err;
} }
...@@ -2569,12 +2567,9 @@ static void sd_stop0(struct gspca_dev *gspca_dev) ...@@ -2569,12 +2567,9 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
if (sd->work_thread != NULL) { mutex_unlock(&gspca_dev->usb_lock);
mutex_unlock(&gspca_dev->usb_lock); flush_work(&sd->work);
destroy_workqueue(sd->work_thread); mutex_lock(&gspca_dev->usb_lock);
mutex_lock(&gspca_dev->usb_lock);
sd->work_thread = NULL;
}
} }
static void do_autogain(struct gspca_dev *gspca_dev) static void do_autogain(struct gspca_dev *gspca_dev)
...@@ -2785,7 +2780,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, ...@@ -2785,7 +2780,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
new_qual = QUALITY_MAX; new_qual = QUALITY_MAX;
if (new_qual != sd->quality) { if (new_qual != sd->quality) {
sd->quality = new_qual; sd->quality = new_qual;
queue_work(sd->work_thread, &sd->work); schedule_work(&sd->work);
} }
} }
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment