V4L/DVB: v4l2_subdev: Move interrupt_service_routine ptr to v4l2_subdev_core_ops

The CX2584x and related cores are multifunction subdevices with a number
of internal blocks that act as interrupt sources.  Move the v4L2_subdev
interrupt_service_routine callback from v4l_subdev_ir_ops to
v4l2_subdev_core_ops, as the video and audio blocks of a CX2584x and
related cores can generate interrupts along with the IR block.  This
change also makes sense for other subdev's that generate interrupts and
do not have an IR block.

Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index ff76f64edac1..a74c0ab859ed 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1765,7 +1765,7 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
                 handled += cx23885_video_irq(dev, vida_status);
 
         if (pci_status & PCI_MSK_IR) {
-                v4l2_subdev_call(dev->sd_ir, ir, interrupt_service_routine,
+                v4l2_subdev_call(dev->sd_ir, core, interrupt_service_routine,
                                  pci_status, &ir_handled);
                 if (ir_handled)
                         handled++;
diff --git a/drivers/media/video/cx23885/cx23888-ir.c b/drivers/media/video/cx23885/cx23888-ir.c
index 28ca90ff223c..51f21636e639 100644
--- a/drivers/media/video/cx23885/cx23888-ir.c
+++ b/drivers/media/video/cx23885/cx23888-ir.c
@@ -1126,11 +1126,10 @@ static const struct v4l2_subdev_core_ops cx23888_ir_core_ops = {
         .g_register = cx23888_ir_g_register,
         .s_register = cx23888_ir_s_register,
 #endif
+        .interrupt_service_routine = cx23888_ir_irq_handler,
 };
 
 static const struct v4l2_subdev_ir_ops cx23888_ir_ir_ops = {
-        .interrupt_service_routine = cx23888_ir_irq_handler,
-
         .rx_read = cx23888_ir_rx_read,
         .rx_g_parameters = cx23888_ir_rx_g_parameters,
         .rx_s_parameters = cx23888_ir_rx_s_parameters,