1 files changed, 10 insertions, 22 deletions

diff --git a/linux/drivers/media/video/cx18/cx18-irq.c b/linux/drivers/media/video/cx18/cx18-irq.c
index aff5a3abd..3e23fc350 100644
--- a/linux/drivers/media/video/cx18/cx18-irq.c
+++ b/linux/drivers/media/video/cx18/cx18-irq.c
@@ -40,17 +40,11 @@ void cx18_work_handler(void *arg)
 {
 	struct cx18 *cx = arg;
 #endif
-	if (test_and_clear_bit(CX18_F_I_WORK_INITED, &cx->i_flags)) {
-		struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
-		/* This thread must use the FIFO scheduler as it
-		 * is realtime sensitive. */
-		sched_setscheduler(current, SCHED_FIFO, &param);
-	}
 	if (test_and_clear_bit(CX18_F_I_WORK_HANDLER_DVB, &cx->i_flags))
 		cx18_dvb_work_handler(cx);
 }
 
-static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
+static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb, int rpu)
 {
 	u32 handle = mb->args[0];
 	struct cx18_stream *s = NULL;
@@ -71,7 +65,7 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
 			  " handle %d\n", handle);
 		mb->error = CXERR_NOT_OPEN;
 		mb->cmd = 0;
-		cx18_mb_ack(cx, mb);
+		cx18_mb_ack(cx, mb, rpu);
 		return;
 	}
 
@@ -98,13 +92,13 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
 	}
 	mb->error = 0;
 	mb->cmd = 0;
-	cx18_mb_ack(cx, mb);
+	cx18_mb_ack(cx, mb, rpu);
 	wake_up(&cx->dma_waitq);
 	if (s->id != -1)
 		wake_up(&s->waitq);
 }
 
-static void epu_debug(struct cx18 *cx, struct cx18_mailbox *mb)
+static void epu_debug(struct cx18 *cx, struct cx18_mailbox *mb, int rpu)
 {
 	char str[256] = { 0 };
 	char *p;
@@ -114,7 +108,7 @@ static void epu_debug(struct cx18 *cx, struct cx18_mailbox *mb)
 		cx18_memcpy_fromio(cx, str, cx->enc_mem + mb->args[1], 252);
 		str[252] = 0;
 	}
-	cx18_mb_ack(cx, mb);
+	cx18_mb_ack(cx, mb, rpu);
 	CX18_DEBUG_INFO("%x %s\n", mb->args[0], str);
 	p = strchr(str, '.');
 	if (!test_bit(CX18_F_I_LOADED_FW, &cx->i_flags) && p && p > str)
@@ -131,10 +125,10 @@ static void epu_cmd(struct cx18 *cx, u32 sw1)
 
 		switch (mb.cmd) {
 		case CX18_EPU_DMA_DONE:
-			epu_dma_done(cx, &mb);
+			epu_dma_done(cx, &mb, CPU);
 			break;
 		case CX18_EPU_DEBUG:
-			epu_debug(cx, &mb);
+			epu_debug(cx, &mb, CPU);
 			break;
 		default:
 			CX18_WARN("Unknown CPU_TO_EPU mailbox command %#08x\n",
@@ -147,11 +141,6 @@ static void epu_cmd(struct cx18 *cx, u32 sw1)
 		cx18_memcpy_fromio(cx, &mb, &cx->scb->apu2epu_mb, sizeof(mb));
 		CX18_WARN("Unknown APU_TO_EPU mailbox command %#08x\n", mb.cmd);
 	}
-
-	if (sw1 & IRQ_HPU_TO_EPU) {
-		cx18_memcpy_fromio(cx, &mb, &cx->scb->hpu2epu_mb, sizeof(mb));
-		CX18_WARN("Unknown HPU_TO_EPU mailbox command %#08x\n", mb.cmd);
-	}
 }
 
 static void xpu_ack(struct cx18 *cx, u32 sw2)
@@ -160,8 +149,6 @@ static void xpu_ack(struct cx18 *cx, u32 sw2)
 		wake_up(&cx->mb_cpu_waitq);
 	if (sw2 & IRQ_APU_TO_EPU_ACK)
 		wake_up(&cx->mb_apu_waitq);
-	if (sw2 & IRQ_HPU_TO_EPU_ACK)
-		wake_up(&cx->mb_hpu_waitq);
 }
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
@@ -190,7 +177,8 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)
 		cx18_write_reg_expect(cx, hw2, HW2_INT_CLR_STATUS, ~hw2, hw2);
 
 	if (sw1 || sw2 || hw2)
-		CX18_DEBUG_HI_IRQ("SW1: %x  SW2: %x  HW2: %x\n", sw1, sw2, hw2);
+		CX18_DEBUG_HI_IRQ("received interrupts "
+				  "SW1: %x  SW2: %x  HW2: %x\n", sw1, sw2, hw2);
 
 	/* To do: interrupt-based I2C handling
 	if (hw2 & (HW2_I2C1_INT|HW2_I2C2_INT)) {
@@ -204,7 +192,7 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)
 		epu_cmd(cx, sw1);
 
 	if (test_and_clear_bit(CX18_F_I_HAVE_WORK, &cx->i_flags))
-		queue_work(cx->work_queue, &cx->work);
+		schedule_work(&cx->work);
 
 	return (sw1 || sw2 || hw2) ? IRQ_HANDLED : IRQ_NONE;
 }