media: zoran: remove test_interrupts

The test_interrupts function is useless, remove it.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h
index 0246635e0eacab967968d0061424c8e557d389c4..fd27d1968e60c490784fa064a621e8520c4d36a3 100644 (file)
--- a/drivers/staging/media/zoran/zoran.h
+++ b/drivers/staging/media/zoran/zoran.h
@@ -345,7 +345,6 @@ struct zoran {
        struct zoran_buffer_col jpg_buffers;    /* MJPEG buffers' info */
 
        /* Additional stuff for testing */
-       int testing;
        int jpeg_error;
        int intr_counter_GIRQ1;
        int intr_counter_GIRQ0;
@@ -372,8 +371,6 @@ struct zoran {
        int running;
        int buf_in_reserve;
 
-       wait_queue_head_t test_q;
-
        dma_addr_t p_sc;
        __le32 *stat_comb;
        dma_addr_t p_scb;

diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
index 28a403257bb91332ad0285b7f822e9231617690e..89fbc114c368adf60f2a449c5c3b848d1e19ca56 100644 (file)
--- a/drivers/staging/media/zoran/zoran_card.c
+++ b/drivers/staging/media/zoran/zoran_card.c
@@ -858,31 +858,6 @@ void zoran_open_init_params(struct zoran *zr)
                pci_err(zr->pci_dev, "%s internal error\n", __func__);
 
        clear_interrupt_counters(zr);
-       zr->testing = 0;
-}
-
-static void test_interrupts(struct zoran *zr)
-{
-       DEFINE_WAIT(wait);
-       int timeout, icr;
-
-       clear_interrupt_counters(zr);
-
-       zr->testing = 1;
-       icr = btread(ZR36057_ICR);
-       btwrite(0x78000000 | ZR36057_ICR_IntPinEn, ZR36057_ICR);
-       prepare_to_wait(&zr->test_q, &wait, TASK_INTERRUPTIBLE);
-       timeout = schedule_timeout(HZ);
-       finish_wait(&zr->test_q, &wait);
-       btwrite(0, ZR36057_ICR);
-       btwrite(0x78000000, ZR36057_ISR);
-       zr->testing = 0;
-       pci_info(zr->pci_dev, "Testing interrupts...\n");
-       if (timeout)
-               pci_info(zr->pci_dev, ": time spent: %d\n", 1 * HZ - timeout);
-       if (zr36067_debug > 1)
-               print_interrupts(zr);
-       btwrite(icr, ZR36057_ICR);
 }
 
 static int zr36057_init(struct zoran *zr)
@@ -896,7 +871,6 @@ static int zr36057_init(struct zoran *zr)
 
        init_waitqueue_head(&zr->v4l_capq);
        init_waitqueue_head(&zr->jpg_capq);
-       init_waitqueue_head(&zr->test_q);
        zr->jpg_buffers.allocated = 0;
        zr->v4l_buffers.allocated = 0;
 
@@ -977,7 +951,6 @@ static int zr36057_init(struct zoran *zr)
        zoran_init_hardware(zr);
        if (zr36067_debug > 2)
                detect_guest_activity(zr);
-       test_interrupts(zr);
        if (!pass_through) {
                decoder_call(zr, video, s_stream, 0);
                encoder_call(zr, video, s_routing, 2, 0, 0);

diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c
index fb318449d784b3a03fbf9feeee5875ee2d25dfc9..c090d7166caaf97e7f742adb52810fcdcf9acb35 100644 (file)
--- a/drivers/staging/media/zoran/zoran_device.c
+++ b/drivers/staging/media/zoran/zoran_device.c
@@ -1109,22 +1109,6 @@ irqreturn_t zoran_irq(int irq, void *dev_id)
        struct zoran *zr = dev_id;
        unsigned long flags;
 
-       if (zr->testing) {
-               /* Testing interrupts */
-               spin_lock_irqsave(&zr->spinlock, flags);
-               while ((stat = count_reset_interrupt(zr))) {
-                       if (count++ > 100) {
-                               btand(~ZR36057_ICR_IntPinEn, ZR36057_ICR);
-                               pci_err(zr->pci_dev, "IRQ lockup while testing, isr=0x%08x, cleared int mask\n",
-                                       stat);
-                               wake_up_interruptible(&zr->test_q);
-                       }
-               }
-               zr->last_isr = stat;
-               spin_unlock_irqrestore(&zr->spinlock, flags);
-               return IRQ_HANDLED;
-       }
-
        spin_lock_irqsave(&zr->spinlock, flags);
        while (1) {
                /* get/clear interrupt status bits */