[media] cx23885-dvb: use a better approach to hook set_frontend

When the frontend drivers got converted to DVBv5 API, the original
hook that tracked when a frontend is set got removed, being replaced
by an approach that would use the gate control. That doesn't work
fine with some boards. Also, the code were called more times than
desired.
Replace it by a logic that will hook the dvb set_frontend ops,
with works with both DVBv3 and DVBv5 calls.
Tested on a Mygica X8502 OEM board.

Tested-by: Alfredo Delaiti <alfredodelaiti@netscape.net>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index bb291c661143b501bc2523b3df484752c40fc8cc..a25a037e88ef78f2b8467b7b6c85fd2b0203a583 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -119,8 +119,6 @@ static void dvb_buf_release(struct videobuf_queue *q,
        cx23885_free_buffer(q, (struct cx23885_buffer *)vb);
 }
 
-static int cx23885_dvb_set_frontend(struct dvb_frontend *fe);
-
 static void cx23885_dvb_gate_ctrl(struct cx23885_tsport  *port, int open)
 {
        struct videobuf_dvb_frontends *f;
@@ -135,12 +133,6 @@ static void cx23885_dvb_gate_ctrl(struct cx23885_tsport  *port, int open)
 
        if (fe && fe->dvb.frontend && fe->dvb.frontend->ops.i2c_gate_ctrl)
                fe->dvb.frontend->ops.i2c_gate_ctrl(fe->dvb.frontend, open);
-
-       /*
-        * FIXME: Improve this path to avoid calling the
-        * cx23885_dvb_set_frontend() every time it passes here.
-        */
-       cx23885_dvb_set_frontend(fe->dvb.frontend);
 }
 
 static struct videobuf_queue_ops dvb_qops = {
@@ -561,9 +553,21 @@ static int cx23885_dvb_set_frontend(struct dvb_frontend *fe)
                cx23885_gpio_set(dev, GPIO_0);
                break;
        }
+
+       /* Call the real set_frontend */
+       if (port->set_frontend)
+               return port->set_frontend(fe);
+
        return 0;
 }
 
+static void cx23885_set_frontend_hook(struct cx23885_tsport *port,
+                                    struct dvb_frontend *fe)
+{
+       port->set_frontend = fe->ops.set_frontend;
+       fe->ops.set_frontend = cx23885_dvb_set_frontend;
+}
+
 static struct lgs8gxx_config magicpro_prohdtve2_lgs8g75_config = {
        .prod = LGS8GXX_PROD_LGS8G75,
        .demod_address = 0x19,
@@ -771,6 +775,8 @@ static int dvb_register(struct cx23885_tsport *port)
                                   0x60, &dev->i2c_bus[1].i2c_adap,
                                   &hauppauge_hvr127x_config);
                }
+               if (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1275)
+                       cx23885_set_frontend_hook(port, fe0->dvb.frontend);
                break;
        case CX23885_BOARD_HAUPPAUGE_HVR1255:
        case CX23885_BOARD_HAUPPAUGE_HVR1255_22111:
@@ -1106,6 +1112,7 @@ static int dvb_register(struct cx23885_tsport *port)
                                &i2c_bus2->i2c_adap,
                                &mygica_x8506_xc5000_config);
                }
+               cx23885_set_frontend_hook(port, fe0->dvb.frontend);
                break;
        case CX23885_BOARD_MAGICPRO_PROHDTVE2:
                i2c_bus = &dev->i2c_bus[0];
@@ -1119,6 +1126,7 @@ static int dvb_register(struct cx23885_tsport *port)
                                &i2c_bus2->i2c_adap,
                                &magicpro_prohdtve2_xc5000_config);
                }
+               cx23885_set_frontend_hook(port, fe0->dvb.frontend);
                break;
        case CX23885_BOARD_HAUPPAUGE_HVR1850:
                i2c_bus = &dev->i2c_bus[0];

diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 5687d3f678db7aee570b56790f91b2c348f297ea..038caf53908b5acd4160b3e5167ebd4f27a69ea0 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -320,6 +320,8 @@ struct cx23885_tsport {
 
        /* Workaround for a temp dvb_frontend that the tuner can attached to */
        struct dvb_frontend analog_fe;
+
+       int (*set_frontend)(struct dvb_frontend *fe);
 };
 
 struct cx23885_kernel_ir {