V4L/DVB (7045): xc5000: Small amount of cleanup and commenting

xc5000: Small amount of cleanup and commenting, just for clarification.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 4 insertions, 6 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 3ba31572c657..254290975cdb 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1885,10 +1885,10 @@ static void dvico_fusionhdtv_hybrid_init(struct cx88_core *core)
  * PCTV HD 800i with an xc5000 sillicon tuner. This is used for both       *
  * analog tuner attach (tuner-core.c) and dvb tuner attach (cx88-dvb.c)    */
 
-int cx88_tuner_callback(void *i2c_algo, int command, int arg)
+int cx88_tuner_callback(void *priv, int command, int arg)
 {
-        struct i2c_algo_bit_data *algo = i2c_algo;
-        struct cx88_core *core = algo->data;
+        struct i2c_algo_bit_data *i2c_algo = priv;
+        struct cx88_core *core = i2c_algo->data;
 
         switch(core->boardnr) {
         case CX88_BOARD_PINNACLE_PCTV_HD_800i:
@@ -1898,7 +1898,6 @@ int cx88_tuner_callback(void *i2c_algo, int command, int arg)
                         cx_clear(MO_GP0_IO, 0x00000004);
                         mdelay(200);
                         cx_set(MO_GP0_IO, 0x00000004);
-                        printk(KERN_ERR "xc5000: in reset for xc5000\n");
                         mdelay(200);
                         return 0;
                 }
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 0246f97a9987..c852efca1592 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -385,7 +385,6 @@ static struct s5h1409_config pinnacle_pctv_hd_800i_config = {
 static struct xc5000_config pinnacle_pctv_hd_800i_tuner_config = {
         .i2c_address    = 0x64,
         .if_khz         = 5380,
-        /* cannot set .video_dev here, do it right before attach */
         .tuner_callback = cx88_tuner_callback,
 };
 
@@ -654,7 +653,7 @@ static int dvb_register(struct cx8802_dev *dev)
                         /* tuner_config.video_dev must point to
                          * i2c_adap.algo_data
                          */
-                        pinnacle_pctv_hd_800i_tuner_config.video_dev =
+                        pinnacle_pctv_hd_800i_tuner_config.priv =
                                                 dev->core->i2c_adap.algo_data;
                         dvb_attach(xc5000_attach, dev->dvb.frontend,
                                    &dev->core->i2c_adap,