[media] cx24117: use hybrid_tuner_request/release_state to share state between multiple instances
...and remove the frontend pointer param from cx24117_attach()
Signed-off-by: Luis Alves <ljalvs@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
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 34120db..0549205 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -1058,20 +1058,13 @@
case 1:
fe0->dvb.frontend = dvb_attach(cx24117_attach,
&tbs_cx24117_config,
- &i2c_bus->i2c_adap, NULL);
+ &i2c_bus->i2c_adap);
break;
/* PORT C */
case 2:
- /* use fe1 pointer as temporary holder */
- /* for the first frontend */
- fe1 = videobuf_dvb_get_frontend(
- &port->dev->ts1.frontends, 1);
-
fe0->dvb.frontend = dvb_attach(cx24117_attach,
&tbs_cx24117_config,
- &i2c_bus->i2c_adap, fe1->dvb.frontend);
- /* we're done, so clear fe1 pointer */
- fe1 = NULL;
+ &i2c_bus->i2c_adap);
break;
}
break;