1 files changed, 2 insertions, 22 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 133ec2bac180..944af8adbe0c 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -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",
                  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) {
                 CX18_ERR("Unable to create incoming mailbox handler thread\n");
                 return -ENOMEM;
@@ -672,18 +672,6 @@ static int __devinit cx18_create_in_workq(struct cx18 *cx)
         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)
 {
         int i;
@@ -710,15 +698,9 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
         mutex_init(&cx->epu2apu_mb_lock);
         mutex_init(&cx->epu2cpu_mb_lock);
 
-        ret = cx18_create_out_workq(cx);
-        if (ret)
-                return ret;
-
         ret = cx18_create_in_workq(cx);
-        if (ret) {
-                destroy_workqueue(cx->out_work_queue);
+        if (ret)
                 return ret;
-        }
 
         cx18_init_in_work_orders(cx);
 
@@ -1107,7 +1089,6 @@ free_mem:
         release_mem_region(cx->base_addr, CX18_MEM_SIZE);
 free_workqueues:
         destroy_workqueue(cx->in_work_queue);
-        destroy_workqueue(cx->out_work_queue);
 err:
         if (retval == 0)
                 retval = -ENODEV;
@@ -1259,7 +1240,6 @@ static void cx18_remove(struct pci_dev *pci_dev)
         cx18_halt_firmware(cx);
 
         destroy_workqueue(cx->in_work_queue);
-        destroy_workqueue(cx->out_work_queue);
 
         cx18_streams_cleanup(cx, 1);