V4L/DVB (8951): xc5000: dont pass devptr in xc5000_attach()

Dont pass devptr in xc5000_attach, dont store it in xc5000_priv.
This pointer is passed into the tuner_callback function, which always
expects a pointer to fe->dvb->priv or i2c_adapter->algo_data.

This prevents future possible bugs in new drivers, such as using a "devptr"
other that the standard fe->dvb->priv in a DVB driver.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d96173ff1dba..07270b77ed8a 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -813,13 +813,9 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &pinnacle_pctv_hd_800i_config,
                                                &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        /* tuner_config.video_dev must point to
-                         * i2c_adap.algo_data
-                         */
                         if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
                                         &core->i2c_adap,
-                                        &pinnacle_pctv_hd_800i_tuner_config,
-                                        core->i2c_adap.algo_data))
+                                        &pinnacle_pctv_hd_800i_tuner_config))
                                 goto frontend_detach;
                 }
                 break;
@@ -874,13 +870,9 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dvico_fusionhdtv7_config,
                                                &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        /* tuner_config.video_dev must point to
-                         * i2c_adap.algo_data
-                         */
                         if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
                                         &core->i2c_adap,
-                                        &dvico_fusionhdtv7_tuner_config,
-                                        core->i2c_adap.algo_data))
+                                        &dvico_fusionhdtv7_tuner_config))
                                 goto frontend_detach;
                 }
                 break;