V4L/DVB (5719): Tuner: Move device-specific private data out of tuner struct

Create private data struct for device specific private data.

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

1 files changed, 25 insertions, 8 deletions

diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index 2987c1685da5..d7e68a639cd8 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -37,6 +37,11 @@ static char *microtune_part[] = {
         [ MT2050 ] = "MT2050",
 };
 
+struct microtune_priv {
+        unsigned int xogc;
+        unsigned int radio_if2;
+};
+
 // IsSpurInBand()?
 static int mt2032_spurcheck(struct i2c_client *c,
                             int f1, int f2, int spectrum_from,int spectrum_to)
@@ -218,6 +223,7 @@ static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
         unsigned char buf[21];
         int lint_try,ret,sel,lock=0;
         struct tuner *t = i2c_get_clientdata(c);
+        struct microtune_priv *priv = t->priv;
 
         tuner_dbg("mt2032_set_if_freq rfin=%d if1=%d if2=%d from=%d to=%d\n",
                   rfin,if1,if2,from,to);
@@ -227,7 +233,7 @@ static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
         i2c_master_recv(c,buf,21);
 
         buf[0]=0;
-        ret=mt2032_compute_freq(c,rfin,if1,if2,from,to,&buf[1],&sel,t->xogc);
+        ret=mt2032_compute_freq(c,rfin,if1,if2,from,to,&buf[1],&sel,priv->xogc);
         if (ret<0)
                 return;
 
@@ -251,10 +257,10 @@ static void mt2032_set_if_freq(struct i2c_client *c, unsigned int rfin,
 
                 tuner_dbg("mt2032: re-init PLLs by LINT\n");
                 buf[0]=7;
-                buf[1]=0x80 +8+t->xogc; // set LINT to re-init PLLs
+                buf[1]=0x80 +8+priv->xogc; // set LINT to re-init PLLs
                 i2c_master_send(c,buf,2);
                 mdelay(10);
-                buf[1]=8+t->xogc;
+                buf[1]=8+priv->xogc;
                 i2c_master_send(c,buf,2);
         }
 
@@ -294,7 +300,8 @@ static void mt2032_set_tv_freq(struct i2c_client *c, unsigned int freq)
 static void mt2032_set_radio_freq(struct i2c_client *c, unsigned int freq)
 {
         struct tuner *t = i2c_get_clientdata(c);
-        int if2 = t->radio_if2;
+        struct microtune_priv *priv = t->priv;
+        int if2 = priv->radio_if2;
 
         // per Manual for FM tuning: first if center freq. 1085 MHz
         mt2032_set_if_freq(c, freq * 1000 / 16,
@@ -305,6 +312,7 @@ static void mt2032_set_radio_freq(struct i2c_client *c, unsigned int freq)
 static int mt2032_init(struct i2c_client *c)
 {
         struct tuner *t = i2c_get_clientdata(c);
+        struct microtune_priv *priv = t->priv;
         unsigned char buf[21];
         int ret,xogc,xok=0;
 
@@ -351,7 +359,7 @@ static int mt2032_init(struct i2c_client *c)
                 if (ret!=2)
                         tuner_warn("i2c i/o error: rc == %d (should be 2)\n",ret);
         } while (xok != 1 );
-        t->xogc=xogc;
+        priv->xogc=xogc;
 
         t->set_tv_freq    = mt2032_set_tv_freq;
         t->set_radio_freq = mt2032_set_radio_freq;
@@ -456,7 +464,8 @@ static void mt2050_set_tv_freq(struct i2c_client *c, unsigned int freq)
 static void mt2050_set_radio_freq(struct i2c_client *c, unsigned int freq)
 {
         struct tuner *t = i2c_get_clientdata(c);
-        int if2 = t->radio_if2;
+        struct microtune_priv *priv = t->priv;
+        int if2 = priv->radio_if2;
 
         mt2050_set_if_freq(c, freq * 1000 / 16, if2);
         mt2050_set_antenna(c, radio_antenna);
@@ -488,21 +497,29 @@ static int mt2050_init(struct i2c_client *c)
 
 int microtune_init(struct i2c_client *c)
 {
+        struct microtune_priv *priv = NULL;
         struct tuner *t = i2c_get_clientdata(c);
         char *name;
         unsigned char buf[21];
         int company_code;
 
+        priv = kzalloc(sizeof(struct microtune_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return -ENOMEM;
+        t->priv = priv;
+
+        priv->radio_if2 = 10700 * 1000; /* 10.7MHz - FM radio */
+
         memset(buf,0,sizeof(buf));
         t->set_tv_freq    = NULL;
         t->set_radio_freq = NULL;
         t->standby    = NULL;
         if (t->std & V4L2_STD_525_60) {
                 tuner_dbg("pinnacle ntsc\n");
-                t->radio_if2 = 41300 * 1000;
+                priv->radio_if2 = 41300 * 1000;
         } else {
                 tuner_dbg("pinnacle pal\n");
-                t->radio_if2 = 33300 * 1000;
+                priv->radio_if2 = 33300 * 1000;
         }
         name = "unknown";