[media] cx25821: Remove deprecated create_singlethread_workqueue

The workqueue "_irq_audio_queues" runs the audio upstream handler.
It has a single work item(&dev->_audio_work_entry) 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.

The work item has been flushed in cx25821_stop_upstream_audio() to ensure
that nothing is pending when the driver is disconnected.

Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/pci/cx25821/cx25821-audio-upstream.c b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
index 05bd957a59d0d3193f4a31de3d0a1266ff746ce3..7c8edb6181ec888d233faa96eb59187d832aa310 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
@@ -242,8 +242,7 @@ void cx25821_stop_upstream_audio(struct cx25821_dev *dev)
        dev->_audioframe_count = 0;
        dev->_audiofile_status = END_OF_FILE;
 
-       destroy_workqueue(dev->_irq_audio_queues);
-       dev->_irq_audio_queues = NULL;
+       flush_work(&dev->_audio_work_entry);
 
        kfree(dev->_audiofilename);
 }
@@ -446,8 +445,7 @@ static int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,
 
                        dev->_audioframe_index = dev->_last_index_irq;
 
-                       queue_work(dev->_irq_audio_queues,
-                                  &dev->_audio_work_entry);
+                       schedule_work(&dev->_audio_work_entry);
                }
 
                if (dev->_is_first_audio_frame) {
@@ -639,14 +637,6 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
 
        /* Work queue */
        INIT_WORK(&dev->_audio_work_entry, cx25821_audioups_handler);
-       dev->_irq_audio_queues =
-           create_singlethread_workqueue("cx25821_audioworkqueue");
-
-       if (!dev->_irq_audio_queues) {
-               printk(KERN_DEBUG
-                       pr_fmt("ERROR: create_singlethread_workqueue() for Audio FAILED!\n"));
-               return -ENOMEM;
-       }
 
        dev->_last_index_irq = 0;
        dev->_audio_is_running = 0;

diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h
index 35c7375e4617c9664c5ef744793e711a6c19b197..ef61dea982e8f864cde03d1ac114ea2879d8b032 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821.h
+++ b/drivers/media/pci/cx25821/cx25821.h
@@ -293,7 +293,6 @@ struct cx25821_dev {
        u32 audio_upstream_riscbuf_size;
        u32 audio_upstream_databuf_size;
        int _audioframe_index;
-       struct workqueue_struct *_irq_audio_queues;
        struct work_struct _audio_work_entry;
        char *input_audiofilename;