lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] v4l/cx18: update workqueue usage

Browse Source 
With cmwq, there's no reason to use separate out_work_queue.  Drop it
and use system_wq instead.  The in_work_queue needs to be ordered so
can't use one of the system wqs; however, as it isn't used to reclaim
memory, allocate the workqueue with alloc_ordered_workqueue() without
WQ_MEM_RECLAIM.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Andy Walls <awalls@md.metrocast.net>
Acked-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Tejun Heo
2011-01-03 10:49:34 -03:00
committed by Mauro Carvalho Chehab
parent fd01ad9894
commit a3bc5e3304
3 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/video/cx18/cx18-driver.c
View File

@@ -664,7 +664,7 @@ static int __devinit cx18_create_in_workq(struct cx18 *cx)
{ {
snprintf(cx->in_workq_name, sizeof(cx->in_workq_name), "%s-in", snprintf(cx->in_workq_name, sizeof(cx->in_workq_name), "%s-in",
cx->v4l2_dev.name); cx->v4l2_dev.name);
cx->in_work_queue = create_singlethread_workqueue(cx->in_workq_name); cx->in_work_queue = alloc_ordered_workqueue(cx->in_workq_name, 0);
if (cx->in_work_queue == NULL) { if (cx->in_work_queue == NULL) {
CX18_ERR("Unable to create incoming mailbox handler thread\n"); CX18_ERR("Unable to create incoming mailbox handler thread\n");
return -ENOMEM; return -ENOMEM;
@@ -672,18 +672,6 @@ static int __devinit cx18_create_in_workq(struct cx18 *cx)
return 0; return 0;
} }
static int __devinit cx18_create_out_workq(struct cx18 *cx)
{
snprintf(cx->out_workq_name, sizeof(cx->out_workq_name), "%s-out",
cx->v4l2_dev.name);
cx->out_work_queue = create_workqueue(cx->out_workq_name);
if (cx->out_work_queue == NULL) {
CX18_ERR("Unable to create outgoing mailbox handler threads\n");
return -ENOMEM;
}
return 0;
}
static void __devinit cx18_init_in_work_orders(struct cx18 *cx) static void __devinit cx18_init_in_work_orders(struct cx18 *cx)
{ {
int i; int i;
@@ -710,16 +698,10 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
mutex_init(&cx->epu2apu_mb_lock); mutex_init(&cx->epu2apu_mb_lock);
mutex_init(&cx->epu2cpu_mb_lock); mutex_init(&cx->epu2cpu_mb_lock);
ret = cx18_create_out_workq(cx); ret = cx18_create_in_workq(cx);
if (ret) if (ret)
return ret; return ret;
ret = cx18_create_in_workq(cx);
if (ret) {
destroy_workqueue(cx->out_work_queue);
return ret;
}
cx18_init_in_work_orders(cx); cx18_init_in_work_orders(cx);
/* start counting open_id at 1 */ /* start counting open_id at 1 */
@@ -1107,7 +1089,6 @@ free_mem:
release_mem_region(cx->base_addr, CX18_MEM_SIZE); release_mem_region(cx->base_addr, CX18_MEM_SIZE);
free_workqueues: free_workqueues:
destroy_workqueue(cx->in_work_queue); destroy_workqueue(cx->in_work_queue);
destroy_workqueue(cx->out_work_queue);
err: err:
if (retval == 0) if (retval == 0)
retval = -ENODEV; retval = -ENODEV;
@@ -1259,7 +1240,6 @@ static void cx18_remove(struct pci_dev *pci_dev)
cx18_halt_firmware(cx); cx18_halt_firmware(cx);
destroy_workqueue(cx->in_work_queue); destroy_workqueue(cx->in_work_queue);
destroy_workqueue(cx->out_work_queue);
cx18_streams_cleanup(cx, 1); cx18_streams_cleanup(cx, 1);

3
drivers/media/video/cx18/cx18-driver.h
View File

@@ -617,9 +617,6 @@ struct cx18 {
struct cx18_in_work_order in_work_order[CX18_MAX_IN_WORK_ORDERS]; struct cx18_in_work_order in_work_order[CX18_MAX_IN_WORK_ORDERS];
char epu_debug_str[256]; /* CX18_EPU_DEBUG is rare: use shared space */ char epu_debug_str[256]; /* CX18_EPU_DEBUG is rare: use shared space */
struct workqueue_struct *out_work_queue;
char out_workq_name[12]; /* "cx18-NN-out" */
/* i2c */ /* i2c */
struct i2c_adapter i2c_adap[2]; struct i2c_adapter i2c_adap[2];
struct i2c_algo_bit_data i2c_algo[2]; struct i2c_algo_bit_data i2c_algo[2];

3
drivers/media/video/cx18/cx18-streams.h
View File

@@ -42,8 +42,7 @@ static inline bool cx18_stream_enabled(struct cx18_stream *s)
/* Related to submission of mdls to firmware */ /* Related to submission of mdls to firmware */
static inline void cx18_stream_load_fw_queue(struct cx18_stream *s) static inline void cx18_stream_load_fw_queue(struct cx18_stream *s)
{ {
struct cx18 *cx = s->cx; schedule_work(&s->out_work_order);
queue_work(cx->out_work_queue, &s->out_work_order);
} }
static inline void cx18_stream_put_mdl_fw(struct cx18_stream *s, static inline void cx18_stream_put_mdl_fw(struct cx18_stream *s,