5 files changed, 14 insertions, 19 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index e4c6e87f6c5d..c91cf8958b38 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1668,9 +1668,8 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra
         return 0;
 }
 
-static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)
 {
-        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
         int ret;
         u8 data[4];
         u32 div;
@@ -1687,7 +1686,7 @@ static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
 
         if (params->frequency > 1530000) data[3] = 0xc0;
 
-        ret = i2c_transfer(&av7110->i2c_adap, &msg, 1);
+        ret = i2c_transfer(i2c, &msg, 1);
         if (ret != 1)
                 return -EIO;
         return 0;
@@ -1751,9 +1750,8 @@ static u8 alps_bsbe1_inittab[] = {
         0xff, 0xff
 };
 
-static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)
 {
-        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
         int ret;
         u8 data[4];
         u32 div;
@@ -1768,7 +1766,7 @@ static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
         data[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
         data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4;
 
-        ret = i2c_transfer(&av7110->i2c_adap, &msg, 1);
+        ret = i2c_transfer(i2c, &msg, 1);
         return (ret != 1) ? -EIO : 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 9746d2bb916f..311be50b2fce 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -453,9 +453,9 @@ static int philips_su1278_ty_ci_set_symbol_rate(struct dvb_frontend *fe, u32 sra
 }
 
 static int philips_su1278_ty_ci_pll_set(struct dvb_frontend *fe,
+                                        struct i2c_adapter *i2c,
                                         struct dvb_frontend_parameters *params)
 {
-        struct budget_av *budget_av = (struct budget_av *) fe->dvb->priv;
         u32 div;
         u8 buf[4];
         struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
@@ -481,7 +481,7 @@ static int philips_su1278_ty_ci_pll_set(struct dvb_frontend *fe,
         else if (params->frequency < 2150000)
                 buf[3] |= 0xC0;
 
-        if (i2c_transfer(&budget_av->budget.i2c_adap, &msg, 1) != 1)
+        if (i2c_transfer(i2c, &msg, 1) != 1)
                 return -EIO;
         return 0;
 }
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index a1267054bc01..88f27a532163 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -548,9 +548,8 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 ra
         return 0;
 }
 
-static int alps_bsru6_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int alps_bsru6_pll_set(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters *params)
 {
-        struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
         u8 buf[4];
         u32 div;
         struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
@@ -567,7 +566,7 @@ static int alps_bsru6_pll_set(struct dvb_frontend *fe, struct dvb_frontend_param
         if (params->frequency > 1530000)
                 buf[3] = 0xc0;
 
-        if (i2c_transfer(&budget_ci->budget.i2c_adap, &msg, 1) != 1)
+        if (i2c_transfer(i2c, &msg, 1) != 1)
                 return -EIO;
         return 0;
 }
@@ -669,9 +668,9 @@ static int philips_su1278_tt_set_symbol_rate(struct dvb_frontend *fe, u32 srate,
 }
 
 static int philips_su1278_tt_pll_set(struct dvb_frontend *fe,
+                                     struct i2c_adapter *i2c,
                                      struct dvb_frontend_parameters *params)
 {
-        struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
         u32 div;
         u8 buf[4];
         struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };
@@ -697,7 +696,7 @@ static int philips_su1278_tt_pll_set(struct dvb_frontend *fe,
         else if (params->frequency < 2150000)
                 buf[3] |= 0xC0;
 
-        if (i2c_transfer(&budget_ci->budget.i2c_adap, &msg, 1) != 1)
+        if (i2c_transfer(i2c, &msg, 1) != 1)
                 return -EIO;
         return 0;
 }
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 8142e26b47f5..b1f21ef0e3b3 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -353,9 +353,8 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra
         return 0;
 }
 
-static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)
 {
-        struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
         u8 data[4];
         u32 div;
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
@@ -370,7 +369,7 @@ static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
 
         if (params->frequency > 1530000) data[3] = 0xc0;
 
-        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
+        if (i2c_transfer(i2c, &msg, 1) != 1) return -EIO;
         return 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 9961917e8a7f..5552ef501996 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -332,9 +332,8 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra
         return 0;
 }
 
-static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)
 {
-        struct budget* budget = (struct budget*) fe->dvb->priv;
         u8 data[4];
         u32 div;
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
@@ -349,7 +348,7 @@ static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
 
         if (params->frequency > 1530000) data[3] = 0xc0;
 
-        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
+        if (i2c_transfer(i2c, &msg, 1) != 1) return -EIO;
         return 0;
 }