V4L/DVB (4028): Change dvb_frontend_ops to be a real field instead of a pointer field inside dvb_frontend

The dvb_frontend_ops is a pointer inside dvb_frontend. That's why every demod-driver
is having a field of dvb_frontend_ops in its private-state-struct and
using the reference for filling the pointer-field in dvb_frontend.
- It saves at least two lines of code per demod-driver,
- reduces object size (one less dereference per frontend_ops-access),
- be coherent with dvb_tuner_ops,
- makes it a little bit easier for newbies to understand how it works and
- avoids stupid mistakes because you would have to copy the dvb_frontend_ops
  always, before you could assign the static pointer directly, which was
  dangerous.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

61 files changed, 604 insertions, 681 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 89ea7620150..15aae7cba2d 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -183,8 +183,8 @@ static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend* fe, struct dv
 
         if (params->frequency < 1500000) buf[3] |= 0x10;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&fc->i2c_adap, &msg, 1) != 1) {
                 return -EIO;
         }
@@ -342,8 +342,8 @@ static int skystar23_samsung_tbdu18132_tuner_set_params(struct dvb_frontend* fe,
         if (params->frequency < 1550000)
                 buf[3] |= 0x02;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&fc->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -389,8 +389,8 @@ int alps_tdee4_stv0297_tuner_set_params (struct dvb_frontend* fe, struct dvb_fro
         else if (fep->frequency <= 822000000) buf[3] = 0x08;
         else buf[3] = 0x88;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n",fep->frequency, buf[0],buf[1],buf[2],buf[3]);
         ret = fc->i2c_request(fc,FC_WRITE,FC_I2C_PORT_TUNER,0x61,buf[0],&buf[1],3);
         deb_tuner("tuner write returned: %d\n",ret);
@@ -505,7 +505,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
 
         /* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */
         if ((fc->fe = stv0299_attach(&samsung_tbmu24112_config, &fc->i2c_adap)) != NULL) {
-                ops = fc->fe->ops;
+                ops = &fc->fe->ops;
 
                 ops->tuner_ops.set_params = samsung_tbmu24112_tuner_set_params;
 
@@ -520,7 +520,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         /* try the air dvb-t (mt352/Samsung tdtc9251dh0(??)) */
         if ((fc->fe = mt352_attach(&samsung_tdtc9251dh0_config, &fc->i2c_adap)) != NULL ) {
                 fc->dev_type          = FC_AIR_DVB;
-                fc->fe->ops->tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs;
+                fc->fe->ops.tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs;
                 info("found the mt352 at i2c address: 0x%02x",samsung_tdtc9251dh0_config.demod_address);
         } else
         /* try the air atsc 2nd generation (nxt2002) */
@@ -532,7 +532,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         /* try the air atsc 3nd generation (lgdt3303) */
         if ((fc->fe = lgdt330x_attach(&air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) {
                 fc->dev_type          = FC_AIR_ATSC3;
-                fc->fe->ops->tuner_ops.set_params = lgdt3303_tuner_set_params;
+                fc->fe->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
                 info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address);
         } else
         /* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */
@@ -543,12 +543,12 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         /* try the cable dvb (stv0297) */
         if ((fc->fe = stv0297_attach(&alps_tdee4_stv0297_config, &fc->i2c_adap)) != NULL) {
                 fc->dev_type                        = FC_CABLE;
-                fc->fe->ops->tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;
+                fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;
                 info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);
         } else
         /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
         if ((fc->fe = vp310_mt312_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
-                ops = fc->fe->ops;
+                ops = &fc->fe->ops;
 
                 ops->tuner_ops.set_params = skystar23_samsung_tbdu18132_tuner_set_params;
 
@@ -570,7 +570,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         } else {
                 if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) {
                         err("frontend registration failed!");
-                        ops = fc->fe->ops;
+                        ops = &fc->fe->ops;
                         if (ops->release != NULL)
                                 ops->release(fc->fe);
                         fc->fe = NULL;
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 1cfa5e5035d..b2018b5a405 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1417,24 +1417,22 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
                 return NULL;
         }
         /* determine settings based on type */
+        /* create dvb_frontend */
         switch (state->dst_type) {
         case DST_TYPE_IS_TERR:
-                memcpy(&state->ops, &dst_dvbt_ops, sizeof(struct dvb_frontend_ops));
+                memcpy(&state->frontend.ops, &dst_dvbt_ops, sizeof(struct dvb_frontend_ops));
                 break;
         case DST_TYPE_IS_CABLE:
-                memcpy(&state->ops, &dst_dvbc_ops, sizeof(struct dvb_frontend_ops));
+                memcpy(&state->frontend.ops, &dst_dvbc_ops, sizeof(struct dvb_frontend_ops));
                 break;
         case DST_TYPE_IS_SAT:
-                memcpy(&state->ops, &dst_dvbs_ops, sizeof(struct dvb_frontend_ops));
+                memcpy(&state->frontend.ops, &dst_dvbs_ops, sizeof(struct dvb_frontend_ops));
                 break;
         default:
                 dprintk(verbose, DST_ERROR, 1, "unknown DST type. please report to the LinuxTV.org DVB mailinglist.");
                 kfree(state);
                 return NULL;
         }
-
-        /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
         state->frontend.demodulator_priv = state;
 
         return state;                           /*      Manu (DST is a card not a frontend)     */
diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 51d4e043716..5bd1bdc4e5f 100644
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -84,8 +84,6 @@ struct dst_state {
 
         struct bt878* bt;
 
-        struct dvb_frontend_ops ops;
-
         /* configuration settings */
         const struct dst_config* config;
 
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 09e18296b3c..b715b972d2f 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -300,8 +300,8 @@ static int microtune_mt7202dtf_tuner_set_params(struct dvb_frontend* fe, struct
         data[2] = ((div >> 10) & 0x60) | cfg;
         data[3] = (cpump << 6) | band_select;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(card->i2c_adapter, &msg, 1);
         return (div * 166666 - 36000000);
 }
@@ -483,8 +483,8 @@ static int vp3021_alps_tded4_tuner_set_params(struct dvb_frontend* fe, struct dv
         else
                 return -EINVAL;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(card->i2c_adapter, &msg, 1);
         return 0;
 }
@@ -607,9 +607,9 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                                                   card->i2c_adapter);
 
                 if (card->fe != NULL) {
-                        card->fe->ops->tuner_ops.calc_regs = thomson_dtt7579_tuner_calc_regs;
-                        card->fe->ops->info.frequency_min = 174000000;
-                        card->fe->ops->info.frequency_max = 862000000;
+                        card->fe->ops.tuner_ops.calc_regs = thomson_dtt7579_tuner_calc_regs;
+                        card->fe->ops.info.frequency_min = 174000000;
+                        card->fe->ops.info.frequency_max = 862000000;
                 }
                 break;
 
@@ -617,7 +617,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 lgdt330x_reset(card);
                 card->fe = lgdt330x_attach(&tdvs_tua6034_config, card->i2c_adapter);
                 if (card->fe != NULL) {
-                        card->fe->ops->tuner_ops.set_params = tdvs_tua6034_tuner_set_params;
+                        card->fe->ops.tuner_ops.set_params = tdvs_tua6034_tuner_set_params;
                         dprintk ("dvb_bt8xx: lgdt330x detected\n");
                 }
                 break;
@@ -632,7 +632,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 digitv_alps_tded4_reset(card);
                 card->fe = nxt6000_attach(&vp3021_alps_tded4_config, card->i2c_adapter);
                 if (card->fe != NULL) {
-                        card->fe->ops->tuner_ops.set_params = vp3021_alps_tded4_tuner_set_params;
+                        card->fe->ops.tuner_ops.set_params = vp3021_alps_tded4_tuner_set_params;
                         dprintk ("dvb_bt8xx: an nxt6000 was detected on your digitv card\n");
                         break;
                 }
@@ -642,7 +642,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 card->fe = mt352_attach(&digitv_alps_tded4_config, card->i2c_adapter);
 
                 if (card->fe != NULL) {
-                        card->fe->ops->tuner_ops.calc_regs = digitv_alps_tded4_tuner_calc_regs;
+                        card->fe->ops.tuner_ops.calc_regs = digitv_alps_tded4_tuner_calc_regs;
                         dprintk ("dvb_bt8xx: an mt352 was detected on your digitv card\n");
                 }
                 break;
@@ -650,16 +650,16 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
         case BTTV_BOARD_AVDVBT_761:
                 card->fe = sp887x_attach(&microtune_mt7202dtf_config, card->i2c_adapter);
                 if (card->fe) {
-                        card->fe->ops->tuner_ops.set_params = microtune_mt7202dtf_tuner_set_params;
+                        card->fe->ops.tuner_ops.set_params = microtune_mt7202dtf_tuner_set_params;
                 }
                 break;
 
         case BTTV_BOARD_AVDVBT_771:
                 card->fe = mt352_attach(&advbt771_samsung_tdtc9251dh0_config, card->i2c_adapter);
                 if (card->fe != NULL) {
-                        card->fe->ops->tuner_ops.calc_regs = advbt771_samsung_tdtc9251dh0_tuner_calc_regs;
-                        card->fe->ops->info.frequency_min = 174000000;
-                        card->fe->ops->info.frequency_max = 862000000;
+                        card->fe->ops.tuner_ops.calc_regs = advbt771_samsung_tdtc9251dh0_tuner_calc_regs;
+                        card->fe->ops.info.frequency_min = 174000000;
+                        card->fe->ops.info.frequency_max = 862000000;
                 }
                 break;
 
@@ -687,9 +687,9 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
         case BTTV_BOARD_PINNACLESAT:
                 card->fe = cx24110_attach(&pctvsat_config, card->i2c_adapter);
                 if (card->fe) {
-                        card->fe->ops->tuner_ops.init = pinnsat_tuner_init;
-                        card->fe->ops->tuner_ops.sleep = pinnsat_tuner_sleep;
-                        card->fe->ops->tuner_ops.set_params = cx24108_tuner_set_params;
+                        card->fe->ops.tuner_ops.init = pinnsat_tuner_init;
+                        card->fe->ops.tuner_ops.sleep = pinnsat_tuner_sleep;
+                        card->fe->ops.tuner_ops.set_params = cx24108_tuner_set_params;
                 }
                 break;
 
@@ -707,8 +707,8 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
         else
                 if (dvb_register_frontend(&card->dvb_adapter, card->fe)) {
                         printk("dvb-bt8xx: Frontend registration failed!\n");
-                        if (card->fe->ops->release)
-                                card->fe->ops->release(card->fe);
+                        if (card->fe->ops.release)
+                                card->fe->ops.release(card->fe);
                         card->fe = NULL;
                 }
 }
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index bbf441215e7..498d21bd927 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -151,8 +151,8 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
                 sizeof (struct dvb_frontend_parameters));
 
         if (status & FE_HAS_LOCK)
-                if (fe->ops->get_frontend)
-                        fe->ops->get_frontend(fe, &e->parameters);
+                if (fe->ops.get_frontend)
+                        fe->ops.get_frontend(fe, &e->parameters);
 
         events->eventw = wp;
 
@@ -211,14 +211,14 @@ static void dvb_frontend_init(struct dvb_frontend *fe)
 {
         dprintk ("DVB: initialising frontend %i (%s)...\n",
                  fe->dvb->num,
-                 fe->ops->info.name);
-
-        if (fe->ops->init)
-                fe->ops->init(fe);
-        if (fe->ops->tuner_ops.init) {
-                fe->ops->tuner_ops.init(fe);
-                if (fe->ops->i2c_gate_ctrl)
-                        fe->ops->i2c_gate_ctrl(fe, 0);
+                 fe->ops.info.name);
+
+        if (fe->ops.init)
+                fe->ops.init(fe);
+        if (fe->ops.tuner_ops.init) {
+                fe->ops.tuner_ops.init(fe);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
         }
 }
 
@@ -264,7 +264,7 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra
         u32 original_frequency = fepriv->parameters.frequency;
 
         /* are we using autoinversion? */
-        autoinversion = ((!(fe->ops->info.caps & FE_CAN_INVERSION_AUTO)) &&
+        autoinversion = ((!(fe->ops.info.caps & FE_CAN_INVERSION_AUTO)) &&
                          (fepriv->parameters.inversion == INVERSION_AUTO));
 
         /* setup parameters correctly */
@@ -334,8 +334,8 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra
         fepriv->parameters.frequency += fepriv->lnb_drift;
         if (autoinversion)
                 fepriv->parameters.inversion = fepriv->inversion;
-        if (fe->ops->set_frontend)
-                fe->ops->set_frontend(fe, &fepriv->parameters);
+        if (fe->ops.set_frontend)
+                fe->ops.set_frontend(fe, &fepriv->parameters);
 
         fepriv->parameters.frequency = original_frequency;
         fepriv->parameters.inversion = original_inversion;
@@ -359,8 +359,8 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)
         /* in SCAN mode, we just set the frontend when asked and leave it alone */
         if (fepriv->tune_mode_flags & FE_TUNE_MODE_ONESHOT) {
                 if (fepriv->state & FESTATE_RETUNE) {
-                        if (fe->ops->set_frontend)
-                                fe->ops->set_frontend(fe, &fepriv->parameters);
+                        if (fe->ops.set_frontend)
+                                fe->ops.set_frontend(fe, &fepriv->parameters);
                         fepriv->state = FESTATE_TUNED;
                 }
                 fepriv->delay = 3*HZ;
@@ -372,8 +372,8 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)
         if (fepriv->state & FESTATE_RETUNE) {
                 s = 0;
         } else {
-                if (fe->ops->read_status)
-                        fe->ops->read_status(fe, &s);
+                if (fe->ops.read_status)
+                        fe->ops.read_status(fe, &s);
                 if (s != fepriv->status) {
                         dvb_frontend_add_event(fe, s);
                         fepriv->status = s;
@@ -386,7 +386,7 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)
                 fepriv->state = FESTATE_TUNED;
 
                 /* if we're tuned, then we have determined the correct inversion */
-                if ((!(fe->ops->info.caps & FE_CAN_INVERSION_AUTO)) &&
+                if ((!(fe->ops.info.caps & FE_CAN_INVERSION_AUTO)) &&
                     (fepriv->parameters.inversion == INVERSION_AUTO)) {
                         fepriv->parameters.inversion = fepriv->inversion;
                 }
@@ -410,7 +410,7 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)
         /* don't actually do anything if we're in the LOSTLOCK state,
          * the frontend is set to FE_CAN_RECOVER, and the max_drift is 0 */
         if ((fepriv->state & FESTATE_LOSTLOCK) &&
-            (fe->ops->info.caps & FE_CAN_RECOVER) && (fepriv->max_drift == 0)) {
+            (fe->ops.info.caps & FE_CAN_RECOVER) && (fepriv->max_drift == 0)) {
                 dvb_frontend_swzigzag_update_delay(fepriv, s & FE_HAS_LOCK);
                 return;
         }
@@ -545,16 +545,16 @@ static int dvb_frontend_thread(void *data)
                 if (fepriv->reinitialise) {
                         dvb_frontend_init(fe);
                         if (fepriv->tone != -1) {
-                                fe->ops->set_tone(fe, fepriv->tone);
+                                fe->ops.set_tone(fe, fepriv->tone);
                         }
                         if (fepriv->voltage != -1) {
-                                fe->ops->set_voltage(fe, fepriv->voltage);
+                                fe->ops.set_voltage(fe, fepriv->voltage);
                         }
                         fepriv->reinitialise = 0;
                 }
 
                 /* do an iteration of the tuning loop */
-                if (fe->ops->tune) {
+                if (fe->ops.tune) {
                         /* have we been asked to retune? */
                         params = NULL;
                         if (fepriv->state & FESTATE_RETUNE) {
@@ -562,7 +562,7 @@ static int dvb_frontend_thread(void *data)
                                 fepriv->state = FESTATE_TUNED;
                         }
 
-                        fe->ops->tune(fe, params, fepriv->tune_mode_flags, &fepriv->delay, &s);
+                        fe->ops.tune(fe, params, fepriv->tune_mode_flags, &fepriv->delay, &s);
                         if (s != fepriv->status) {
                                 dvb_frontend_add_event(fe, s);
                                 fepriv->status = s;
@@ -574,15 +574,15 @@ static int dvb_frontend_thread(void *data)
 
         if (dvb_shutdown_timeout) {
                 if (dvb_powerdown_on_sleep)
-                        if (fe->ops->set_voltage)
-                                fe->ops->set_voltage(fe, SEC_VOLTAGE_OFF);
-                if (fe->ops->tuner_ops.sleep) {
-                        fe->ops->tuner_ops.sleep(fe);
-                        if (fe->ops->i2c_gate_ctrl)
-                                fe->ops->i2c_gate_ctrl(fe, 0);
+                        if (fe->ops.set_voltage)
+                                fe->ops.set_voltage(fe, SEC_VOLTAGE_OFF);
+                if (fe->ops.tuner_ops.sleep) {
+                        fe->ops.tuner_ops.sleep(fe);
+                        if (fe->ops.i2c_gate_ctrl)
+                                fe->ops.i2c_gate_ctrl(fe, 0);
                 }
-                if (fe->ops->sleep)
-                        fe->ops->sleep(fe);
+                if (fe->ops.sleep)
+                        fe->ops.sleep(fe);
         }
 
         fepriv->thread_pid = 0;
@@ -734,7 +734,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
         switch (cmd) {
         case FE_GET_INFO: {
                 struct dvb_frontend_info* info = parg;
-                memcpy(info, &fe->ops->info, sizeof(struct dvb_frontend_info));
+                memcpy(info, &fe->ops.info, sizeof(struct dvb_frontend_info));
 
                 /* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't
                  * do it, it is done for it. */
@@ -754,58 +754,58 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                         break;
                 }
 
-                if (fe->ops->read_status)
-                        err = fe->ops->read_status(fe, status);
+                if (fe->ops.read_status)
+                        err = fe->ops.read_status(fe, status);
                 break;
         }
         case FE_READ_BER:
-                if (fe->ops->read_ber)
-                        err = fe->ops->read_ber(fe, (__u32*) parg);
+                if (fe->ops.read_ber)
+                        err = fe->ops.read_ber(fe, (__u32*) parg);
                 break;
 
         case FE_READ_SIGNAL_STRENGTH:
-                if (fe->ops->read_signal_strength)
-                        err = fe->ops->read_signal_strength(fe, (__u16*) parg);
+                if (fe->ops.read_signal_strength)
+                        err = fe->ops.read_signal_strength(fe, (__u16*) parg);
                 break;
 
         case FE_READ_SNR:
-                if (fe->ops->read_snr)
-                        err = fe->ops->read_snr(fe, (__u16*) parg);
+                if (fe->ops.read_snr)
+                        err = fe->ops.read_snr(fe, (__u16*) parg);
                 break;
 
         case FE_READ_UNCORRECTED_BLOCKS:
-                if (fe->ops->read_ucblocks)
-                        err = fe->ops->read_ucblocks(fe, (__u32*) parg);
+                if (fe->ops.read_ucblocks)
+                        err = fe->ops.read_ucblocks(fe, (__u32*) parg);
                 break;
 
 
         case FE_DISEQC_RESET_OVERLOAD:
-                if (fe->ops->diseqc_reset_overload) {
-                        err = fe->ops->diseqc_reset_overload(fe);
+                if (fe->ops.diseqc_reset_overload) {
+                        err = fe->ops.diseqc_reset_overload(fe);
                         fepriv->state = FESTATE_DISEQC;
                         fepriv->status = 0;
                 }
                 break;
 
         case FE_DISEQC_SEND_MASTER_CMD:
-                if (fe->ops->diseqc_send_master_cmd) {
-                        err = fe->ops->diseqc_send_master_cmd(fe, (struct dvb_diseqc_master_cmd*) parg);
+                if (fe->ops.diseqc_send_master_cmd) {
+                        err = fe->ops.diseqc_send_master_cmd(fe, (struct dvb_diseqc_master_cmd*) parg);
                         fepriv->state = FESTATE_DISEQC;
                         fepriv->status = 0;
                 }
                 break;
 
         case FE_DISEQC_SEND_BURST:
-                if (fe->ops->diseqc_send_burst) {
-                        err = fe->ops->diseqc_send_burst(fe, (fe_sec_mini_cmd_t) parg);
+                if (fe->ops.diseqc_send_burst) {
+                        err = fe->ops.diseqc_send_burst(fe, (fe_sec_mini_cmd_t) parg);
                         fepriv->state = FESTATE_DISEQC;
                         fepriv->status = 0;
                 }
                 break;
 
         case FE_SET_TONE:
-                if (fe->ops->set_tone) {
-                        err = fe->ops->set_tone(fe, (fe_sec_tone_mode_t) parg);
+                if (fe->ops.set_tone) {
+                        err = fe->ops.set_tone(fe, (fe_sec_tone_mode_t) parg);
                         fepriv->tone = (fe_sec_tone_mode_t) parg;
                         fepriv->state = FESTATE_DISEQC;
                         fepriv->status = 0;
@@ -813,8 +813,8 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                 break;
 
         case FE_SET_VOLTAGE:
-                if (fe->ops->set_voltage) {
-                        err = fe->ops->set_voltage(fe, (fe_sec_voltage_t) parg);
+                if (fe->ops.set_voltage) {
+                        err = fe->ops.set_voltage(fe, (fe_sec_voltage_t) parg);
                         fepriv->voltage = (fe_sec_voltage_t) parg;
                         fepriv->state = FESTATE_DISEQC;
                         fepriv->status = 0;
@@ -822,11 +822,11 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                 break;
 
         case FE_DISHNETWORK_SEND_LEGACY_CMD:
-                if (fe->ops->dishnetwork_send_legacy_command) {
-                        err = fe->ops->dishnetwork_send_legacy_command(fe, (unsigned long) parg);
+                if (fe->ops.dishnetwork_send_legacy_command) {
+                        err = fe->ops.dishnetwork_send_legacy_command(fe, (unsigned long) parg);
                         fepriv->state = FESTATE_DISEQC;
                         fepriv->status = 0;
-                } else if (fe->ops->set_voltage) {
+                } else if (fe->ops.set_voltage) {
                         /*
                          * NOTE: This is a fallback condition.  Some frontends
                          * (stv0299 for instance) take longer than 8msec to
@@ -856,7 +856,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                         /* before sending a command, initialize by sending
                          * a 32ms 18V to the switch
                          */
-                        fe->ops->set_voltage(fe, SEC_VOLTAGE_18);
+                        fe->ops.set_voltage(fe, SEC_VOLTAGE_18);
                         dvb_frontend_sleep_until(&nexttime, 32000);
 
                         for (i = 0; i < 9; i++) {
@@ -864,7 +864,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                                         do_gettimeofday(&tv[i + 1]);
                                 if ((cmd & 0x01) != last) {
                                         /* set voltage to (last ? 13V : 18V) */
-                                        fe->ops->set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);
+                                        fe->ops.set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);
                                         last = (last) ? 0 : 1;
                                 }
                                 cmd = cmd >> 1;
@@ -884,13 +884,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                 break;
 
         case FE_DISEQC_RECV_SLAVE_REPLY:
-                if (fe->ops->diseqc_recv_slave_reply)
-                        err = fe->ops->diseqc_recv_slave_reply(fe, (struct dvb_diseqc_slave_reply*) parg);
+                if (fe->ops.diseqc_recv_slave_reply)
+                        err = fe->ops.diseqc_recv_slave_reply(fe, (struct dvb_diseqc_slave_reply*) parg);
                 break;
 
         case FE_ENABLE_HIGH_LNB_VOLTAGE:
-                if (fe->ops->enable_high_lnb_voltage)
-                        err = fe->ops->enable_high_lnb_voltage(fe, (long) parg);
+                if (fe->ops.enable_high_lnb_voltage)
+                        err = fe->ops.enable_high_lnb_voltage(fe, (long) parg);
                 break;
 
         case FE_SET_FRONTEND: {
@@ -908,7 +908,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                         fepriv->parameters.inversion = INVERSION_AUTO;
                         fetunesettings.parameters.inversion = INVERSION_AUTO;
                 }
-                if (fe->ops->info.type == FE_OFDM) {
+                if (fe->ops.info.type == FE_OFDM) {
                         /* without hierachical coding code_rate_LP is irrelevant,
                          * so we tolerate the otherwise invalid FEC_NONE setting */
                         if (fepriv->parameters.u.ofdm.hierarchy_information == HIERARCHY_NONE &&
@@ -917,13 +917,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                 }
 
                 /* get frontend-specific tuning settings */
-                if (fe->ops->get_tune_settings && (fe->ops->get_tune_settings(fe, &fetunesettings) == 0)) {
+                if (fe->ops.get_tune_settings && (fe->ops.get_tune_settings(fe, &fetunesettings) == 0)) {
                         fepriv->min_delay = (fetunesettings.min_delay_ms * HZ) / 1000;
                         fepriv->max_drift = fetunesettings.max_drift;
                         fepriv->step_size = fetunesettings.step_size;
                 } else {
                         /* default values */
-                        switch(fe->ops->info.type) {
+                        switch(fe->ops.info.type) {
                         case FE_QPSK:
                                 fepriv->min_delay = HZ/20;
                                 fepriv->step_size = fepriv->parameters.u.qpsk.symbol_rate / 16000;
@@ -938,8 +938,8 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
 
                         case FE_OFDM:
                                 fepriv->min_delay = HZ/20;
-                                fepriv->step_size = fe->ops->info.frequency_stepsize * 2;
-                                fepriv->max_drift = (fe->ops->info.frequency_stepsize * 2) + 1;
+                                fepriv->step_size = fe->ops.info.frequency_stepsize * 2;
+                                fepriv->max_drift = (fe->ops.info.frequency_stepsize * 2) + 1;
                                 break;
                         case FE_ATSC:
                                 printk("dvb-core: FE_ATSC not handled yet.\n");
@@ -962,9 +962,9 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                 break;
 
         case FE_GET_FRONTEND:
-                if (fe->ops->get_frontend) {
+                if (fe->ops.get_frontend) {
                         memcpy (parg, &fepriv->parameters, sizeof (struct dvb_frontend_parameters));
-                        err = fe->ops->get_frontend(fe, (struct dvb_frontend_parameters*) parg);
+                        err = fe->ops.get_frontend(fe, (struct dvb_frontend_parameters*) parg);
                 }
                 break;
 
@@ -1077,7 +1077,7 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
 
         printk ("DVB: registering frontend %i (%s)...\n",
                 fe->dvb->num,
-                fe->ops->info.name);
+                fe->ops.info.name);
 
         dvb_register_device (fe->dvb, &fepriv->dvbdev, &dvbdev_template,
                              fe, DVB_DEVICE_FRONTEND);
@@ -1095,15 +1095,15 @@ int dvb_unregister_frontend(struct dvb_frontend* fe)
         mutex_lock(&frontend_mutex);
         dvb_unregister_device (fepriv->dvbdev);
         dvb_frontend_stop (fe);
-        if (fe->ops->tuner_ops.release) {
-                fe->ops->tuner_ops.release(fe);
-                if (fe->ops->i2c_gate_ctrl)
-                        fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.release) {
+                fe->ops.tuner_ops.release(fe);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
         }
-        if (fe->ops->release)
-                fe->ops->release(fe);
+        if (fe->ops.release)
+                fe->ops.release(fe);
         else
-                printk("dvb_frontend: Demodulator (%s) does not have a release callback!\n", fe->ops->info.name);
+                printk("dvb_frontend: Demodulator (%s) does not have a release callback!\n", fe->ops.info.name);
         /* fe is invalid now */
         kfree(fepriv);
         mutex_unlock(&frontend_mutex);
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 05ec9954b15..fee52baa148 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -140,7 +140,7 @@ struct dvb_fe_events {
 };
 
 struct dvb_frontend {
-        struct dvb_frontend_ops* ops;
+        struct dvb_frontend_ops ops;
         struct dvb_adapter *dvb;
         void* demodulator_priv;
         void* tuner_priv;
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 500785e41e2..d0063ae120b 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -360,8 +360,8 @@ static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_device *d)
         memcpy(d->pll_init, bpll, 4);
         d->pll_desc = &dvb_pll_fmd1216me;
 
-        d->fe->ops->tuner_ops.init = dvb_usb_tuner_init_i2c;
-        d->fe->ops->tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;
+        d->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c;
+        d->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;
 
         return 0;
 }
@@ -370,7 +370,7 @@ static int cxusb_dee1601_tuner_attach(struct dvb_usb_device *d)
 {
         d->pll_addr = 0x61;
         d->pll_desc = &dvb_pll_thomson_dtt7579;
-        d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+        d->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
         return 0;
 }
 
@@ -378,7 +378,7 @@ static int cxusb_lgz201_tuner_attach(struct dvb_usb_device *d)
 {
         d->pll_addr = 0x61;
         d->pll_desc = &dvb_pll_lg_z201;
-        d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+        d->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
         return 0;
 }
 
@@ -386,13 +386,13 @@ static int cxusb_dtt7579_tuner_attach(struct dvb_usb_device *d)
 {
         d->pll_addr = 0x60;
         d->pll_desc = &dvb_pll_thomson_dtt7579;
-        d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+        d->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
         return 0;
 }
 
 static int cxusb_lgdt3303_tuner_attach(struct dvb_usb_device *d)
 {
-        d->fe->ops->tuner_ops.set_params = cxusb_lgh064f_tuner_set_params;
+        d->fe->ops.tuner_ops.set_params = cxusb_lgh064f_tuner_set_params;
         return 0;
 }
 
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index def0c111ce0..f4c45f386eb 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -20,11 +20,12 @@ static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_device *d)
         struct dibusb_state *st = d->priv;
 
         demod_cfg.demod_address = 0x8;
-        d->fe->ops->tuner_ops.init = dvb_usb_tuner_init_i2c;
-        d->fe->ops->tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;
 
-        if ((d->fe = dib3000mb_attach(&demod_cfg,&d->i2c_adap,&st->ops)) == NULL)
+        if ((d->fe = dib3000mb_attach(&demod_cfg,&d->i2c_adap,&st->ops)) == NULL) {
+                d->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c;
+                d->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;
                 return -ENODEV;
+        }
 
         d->tuner_pass_ctrl = st->ops.tuner_pass_ctrl;
 
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 56814ba8037..c14d9efb48f 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -129,11 +129,11 @@ static struct nxt6000_config digitv_nxt6000_config = {
 static int digitv_frontend_attach(struct dvb_usb_device *d)
 {
         if ((d->fe = mt352_attach(&digitv_mt352_config, &d->i2c_adap)) != NULL) {
-                d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+                d->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
                 return 0;
         }
         if ((d->fe = nxt6000_attach(&digitv_nxt6000_config, &d->i2c_adap)) != NULL) {
-                d->fe->ops->tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
+                d->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
                 return 0;
         }
         return -EIO;
diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
index 2df6da2b54f..17413adec7a 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u-fe.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
@@ -18,7 +18,6 @@ struct dtt200u_fe_state {
 
         struct dvb_frontend_parameters fep;
         struct dvb_frontend frontend;
-        struct dvb_frontend_ops ops;
 };
 
 static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)
@@ -163,9 +162,8 @@ struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d)
         deb_info("attaching frontend dtt200u\n");
 
         state->d = d;
-        memcpy(&state->ops,&dtt200u_fe_ops,sizeof(struct dvb_frontend_ops));
 
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops,&dtt200u_fe_ops,sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
         return &state->frontend;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index 2517b228381..ec631708c39 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -183,13 +183,13 @@ int dvb_usb_fe_init(struct dvb_usb_device* d)
 
         /* re-assign sleep and wakeup functions */
         if (d->fe != NULL) {
-                d->fe_init = d->fe->ops->init;   d->fe->ops->init  = dvb_usb_fe_wakeup;
-                d->fe_sleep = d->fe->ops->sleep; d->fe->ops->sleep = dvb_usb_fe_sleep;
+                d->fe_init = d->fe->ops.init;   d->fe->ops.init  = dvb_usb_fe_wakeup;
+                d->fe_sleep = d->fe->ops.sleep; d->fe->ops.sleep = dvb_usb_fe_sleep;
 
                 if (dvb_register_frontend(&d->dvb_adap, d->fe)) {
                         err("Frontend registration failed.");
-                        if (d->fe->ops->release)
-                                d->fe->ops->release(d->fe);
+                        if (d->fe->ops.release)
+                                d->fe->ops.release(d->fe);
                         d->fe = NULL;
                         return -ENODEV;
                 }
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 6c868d66742..6b611a72509 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -63,8 +63,8 @@ int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe)
         deb_pll("pll-buf: %x %x %x %x\n",d->pll_init[0],d->pll_init[1],
                         d->pll_init[2],d->pll_init[3]);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&d->i2c_adap, &msg, 1) != 1) {
                 err("tuner i2c write failed for pll_init.");
                 ret = -EREMOTEIO;
@@ -109,8 +109,8 @@ int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_pa
         if (d->tuner_pass_ctrl)
                 d->tuner_pass_ctrl(fe,1,d->pll_addr);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&d->i2c_adap, &msg, 1) != 1) {
                 err("tuner i2c write failed for pll_set.");
                 ret = -EREMOTEIO;
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c
index 6dbe9dfb03c..97d74da0dad 100644
--- a/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/drivers/media/dvb/dvb-usb/umt-010.c
@@ -67,7 +67,7 @@ static int umt_tuner_attach (struct dvb_usb_device *d)
 {
         d->pll_addr = 0x61;
         d->pll_desc = &dvb_pll_tua6034;
-        d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+        d->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
         return 0;
 }
 
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index 9d26f46de09..d4da494132e 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -287,7 +287,8 @@ struct dvb_frontend * vp702x_fe_attach(struct dvb_usb_device *d)
                 goto error;
 
         s->d = d;
-        s->fe.ops = &vp702x_fe_ops;
+
+        memcpy(&s->fe.ops,&vp702x_fe_ops,sizeof(struct dvb_frontend_ops));
         s->fe.demodulator_priv = s;
 
         s->lnb_buf[1] = SET_LNB_POWER;
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index e98e5a517f5..8452eef9032 100644
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -23,8 +23,6 @@
 
 struct vp7045_fe_state {
         struct dvb_frontend fe;
-        struct dvb_frontend_ops ops;
-
         struct dvb_usb_device *d;
 };
 
@@ -151,8 +149,7 @@ struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d)
                 goto error;
 
         s->d = d;
-        memcpy(&s->ops, &vp7045_fe_ops, sizeof(struct dvb_frontend_ops));
-        s->fe.ops = &s->ops;
+        memcpy(&s->fe.ops, &vp7045_fe_ops, sizeof(struct dvb_frontend_ops));
         s->fe.demodulator_priv = s;
 
         return &s->fe;
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index 1708a1d4893..baeb311de89 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -48,7 +48,6 @@
 struct bcm3510_state {
 
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         const struct bcm3510_config* config;
         struct dvb_frontend frontend;
 
@@ -791,10 +790,9 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config,
 
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &bcm3510_ops, sizeof(struct dvb_frontend_ops));
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &bcm3510_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
         mutex_init(&state->hab_mutex);
diff --git a/drivers/media/dvb/frontends/bsbe1.h b/drivers/media/dvb/frontends/bsbe1.h
index b2aeddb14e1..d8f65738e5d 100644
--- a/drivers/media/dvb/frontends/bsbe1.h
+++ b/drivers/media/dvb/frontends/bsbe1.h
@@ -106,8 +106,8 @@ static int alps_bsbe1_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         data[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
         data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         ret = i2c_transfer(i2c, &msg, 1);
         return (ret != 1) ? -EIO : 0;
 }
diff --git a/drivers/media/dvb/frontends/bsru6.h b/drivers/media/dvb/frontends/bsru6.h
index 5533512b04c..e231cd84b3a 100644
--- a/drivers/media/dvb/frontends/bsru6.h
+++ b/drivers/media/dvb/frontends/bsru6.h
@@ -120,8 +120,8 @@ static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe, struct dvb_front
         if (params->frequency > 1530000)
                 buf[3] = 0xc0;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(i2c, &msg, 1) != 1)
                 return -EIO;
         return 0;
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 02fee904752..3c7c09a362b 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -34,8 +34,6 @@ struct cx22700_state {
 
         struct i2c_adapter* i2c;
 
-        struct dvb_frontend_ops ops;
-
         const struct cx22700_config* config;
 
         struct dvb_frontend frontend;
@@ -327,9 +325,9 @@ static int cx22700_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         cx22700_writereg (state, 0x00, 0x02); /* XXX CHECKME: soft reset*/
         cx22700_writereg (state, 0x00, 0x00);
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         cx22700_set_inversion (state, p->inversion);
@@ -388,13 +386,12 @@ struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &cx22700_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
         if (cx22700_readreg(state, 0x07) < 0) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &cx22700_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index a129fc9cba3..4106d46c957 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -40,8 +40,6 @@ struct cx22702_state {
 
         struct i2c_adapter* i2c;
 
-        struct dvb_frontend_ops ops;
-
         /* configuration settings */
         const struct cx22702_config* config;
 
@@ -211,9 +209,9 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
         u8 val;
         struct cx22702_state* state = fe->demodulator_priv;
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         /* set inversion */
@@ -479,7 +477,6 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &cx22702_ops, sizeof(struct dvb_frontend_ops));
         state->prevUCBlocks = 0;
 
         /* check if the demod is there */
@@ -487,7 +484,7 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
                 goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &cx22702_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 8d98ffb61e4..ce3c7398bac 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -36,8 +36,6 @@ struct cx24110_state {
 
         struct i2c_adapter* i2c;
 
-        struct dvb_frontend_ops ops;
-
         const struct cx24110_config* config;
 
         struct dvb_frontend frontend;
@@ -538,9 +536,9 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         struct cx24110_state *state = fe->demodulator_priv;
 
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         cx24110_set_inversion (state, p->inversion);
@@ -606,7 +604,6 @@ struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &cx24110_ops, sizeof(struct dvb_frontend_ops));
         state->lastber = 0;
         state->lastbler = 0;
         state->lastesn0 = 0;
@@ -616,7 +613,7 @@ struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
         if ((ret != 0x5a) && (ret != 0x69)) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &cx24110_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index c7142296406..f2f795cba56 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -41,7 +41,6 @@ static int debug;
 struct cx24123_state
 {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         const struct cx24123_config* config;
 
         struct dvb_frontend frontend;
@@ -429,8 +428,8 @@ static int cx24123_set_symbolrate(struct cx24123_state* state, u32 srate)
         u8 pll_mult;
 
         /*  check if symbol rate is within limits */
-        if ((srate > state->ops.info.symbol_rate_max) ||
-            (srate < state->ops.info.symbol_rate_min))
+        if ((srate > state->frontend.ops.info.symbol_rate_max) ||
+            (srate < state->frontend.ops.info.symbol_rate_min))
                 return -EOPNOTSUPP;;
 
         /* choose the sampling rate high enough for the required operation,
@@ -950,7 +949,6 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &cx24123_ops, sizeof(struct dvb_frontend_ops));
         state->lastber = 0;
         state->snr = 0;
         state->VCAarg = 0;
@@ -968,7 +966,7 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,
         }
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &cx24123_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/dib3000-common.h b/drivers/media/dvb/frontends/dib3000-common.h
index c31d6df1547..be1c0d3e138 100644
--- a/drivers/media/dvb/frontends/dib3000-common.h
+++ b/drivers/media/dvb/frontends/dib3000-common.h
@@ -38,8 +38,6 @@
 struct dib3000_state {
         struct i2c_adapter* i2c;
 
-        struct dvb_frontend_ops ops;
-
 /* configuration settings */
         struct dib3000_config config;
 
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index f2f8071ad1b..7c6dc7e3090 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -60,9 +60,9 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,
         fe_code_rate_t fe_cr = FEC_NONE;
         int search_state, seq;
 
-        if (tuner && fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, fep);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (tuner && fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, fep);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
 
                 deb_setf("bandwidth: ");
                 switch (ofdm->bandwidth) {
@@ -705,7 +705,6 @@ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
         /* setup the state */
         state->i2c = i2c;
         memcpy(&state->config,config,sizeof(struct dib3000_config));
-        memcpy(&state->ops, &dib3000mb_ops, sizeof(struct dvb_frontend_ops));
 
         /* check for the correct demod */
         if (rd(DIB3000_REG_MANUFACTOR_ID) != DIB3000_I2C_ID_DIBCOM)
@@ -715,7 +714,7 @@ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
                 goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &dib3000mb_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
         /* set the xfer operations */
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 68a443b3d50..6c3be252998 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -462,9 +462,9 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,
         int search_state,auto_val;
         u16 val;
 
-        if (tuner && fe->ops->tuner_ops.set_params) { /* initial call from dvb */
-                fe->ops->tuner_ops.set_params(fe, fep);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (tuner && fe->ops.tuner_ops.set_params) { /* initial call from dvb */
+                fe->ops.tuner_ops.set_params(fe, fep);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
 
                 state->last_tuned_freq = fep->frequency;
         //      if (!scanboost) {
@@ -837,7 +837,6 @@ struct dvb_frontend* dib3000mc_attach(const struct dib3000_config* config,
         /* setup the state */
         state->i2c = i2c;
         memcpy(&state->config,config,sizeof(struct dib3000_config));
-        memcpy(&state->ops, &dib3000mc_ops, sizeof(struct dvb_frontend_ops));
 
         /* check for the correct demod */
         if (rd(DIB3000_REG_MANUFACTOR_ID) != DIB3000_I2C_ID_DIBCOM)
@@ -857,7 +856,7 @@ struct dvb_frontend* dib3000mc_attach(const struct dib3000_config* config,
         }
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &dib3000mc_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
         /* set the xfer operations */
@@ -874,6 +873,7 @@ error:
         kfree(state);
         return NULL;
 }
+EXPORT_SYMBOL(dib3000mc_attach);
 
 static struct dvb_frontend_ops dib3000mc_ops = {
 
@@ -912,5 +912,3 @@ static struct dvb_frontend_ops dib3000mc_ops = {
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(dib3000mc_attach);
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index a1a4be41e03..a189683454b 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -505,8 +505,8 @@ static int dvb_pll_sleep(struct dvb_frontend *fe)
         buf[2] = priv->pll_desc->entries[i].config;
         buf[3] = priv->pll_desc->entries[i].cb;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if ((result = i2c_transfer(priv->i2c, &msg, 1)) != 1) {
                 return result;
         }
@@ -529,15 +529,15 @@ static int dvb_pll_set_params(struct dvb_frontend *fe, struct dvb_frontend_param
                 return -EINVAL;
 
         // DVBT bandwidth only just now
-        if (fe->ops->info.type == FE_OFDM) {
+        if (fe->ops.info.type == FE_OFDM) {
                 bandwidth = params->u.ofdm.bandwidth;
         }
 
         if ((result = dvb_pll_configure(priv->pll_desc, buf, params->frequency, bandwidth)) != 0)
                 return result;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if ((result = i2c_transfer(priv->i2c, &msg, 1)) != 1) {
                 return result;
         }
@@ -567,7 +567,7 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parame
                 return -EINVAL;
 
         // DVBT bandwidth only just now
-        if (fe->ops->info.type == FE_OFDM) {
+        if (fe->ops.info.type == FE_OFDM) {
                 bandwidth = params->u.ofdm.bandwidth;
         }
 
@@ -623,10 +623,10 @@ int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2
         priv->i2c = i2c;
         priv->pll_desc = desc;
 
-        memcpy(&fe->ops->tuner_ops, &dvb_pll_tuner_ops, sizeof(struct dvb_tuner_ops));
-        strncpy(fe->ops->tuner_ops.info.name, desc->name, 128);
-        fe->ops->tuner_ops.info.frequency_min = desc->min;
-        fe->ops->tuner_ops.info.frequency_min = desc->max;
+        memcpy(&fe->ops.tuner_ops, &dvb_pll_tuner_ops, sizeof(struct dvb_tuner_ops));
+        strncpy(fe->ops.tuner_ops.info.name, desc->name, 128);
+        fe->ops.tuner_ops.info.frequency_min = desc->min;
+        fe->ops.tuner_ops.info.frequency_min = desc->max;
 
         fe->tuner_priv = priv;
         return 0;
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c
index 78ea4ff03e6..6271b1e7f6a 100644
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -30,7 +30,6 @@
 
 
 struct dvb_dummy_fe_state {
-        struct dvb_frontend_ops ops;
         struct dvb_frontend frontend;
 };
 
@@ -121,11 +120,8 @@ struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void)
         state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
-        /* setup the state */
-        memcpy(&state->ops, &dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops));
-
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
@@ -144,11 +140,8 @@ struct dvb_frontend* dvb_dummy_fe_qpsk_attach()
         state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
-        /* setup the state */
-        memcpy(&state->ops, &dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops));
-
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
@@ -167,11 +160,8 @@ struct dvb_frontend* dvb_dummy_fe_qam_attach()
         state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
-        /* setup the state */
-        memcpy(&state->ops, &dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops));
-
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/isl6421.c b/drivers/media/dvb/frontends/isl6421.c
index 36992077aaf..58c34db3107 100644
--- a/drivers/media/dvb/frontends/isl6421.c
+++ b/drivers/media/dvb/frontends/isl6421.c
@@ -99,11 +99,11 @@ static void isl6421_release(struct dvb_frontend *fe)
         isl6421_set_voltage(fe, SEC_VOLTAGE_OFF);
 
         /* free data & call next release routine */
-        fe->ops->release = isl6421->release_chain;
+        fe->ops.release = isl6421->release_chain;
         kfree(fe->misc_priv);
         fe->misc_priv = NULL;
-        if (fe->ops->release)
-                fe->ops->release(fe);
+        if (fe->ops.release)
+                fe->ops.release(fe);
 }
 
 int isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,
@@ -133,12 +133,12 @@ int isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr
         }
 
         /* install release callback */
-        isl6421->release_chain = fe->ops->release;
-        fe->ops->release = isl6421_release;
+        isl6421->release_chain = fe->ops.release;
+        fe->ops.release = isl6421_release;
 
         /* override frontend ops */
-        fe->ops->set_voltage = isl6421_set_voltage;
-        fe->ops->enable_high_lnb_voltage = isl6421_enable_high_lnb_voltage;
+        fe->ops.set_voltage = isl6421_set_voltage;
+        fe->ops.enable_high_lnb_voltage = isl6421_enable_high_lnb_voltage;
 
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index fa4a87e0049..f3bc82e44a2 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -32,7 +32,6 @@
 
 struct l64781_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         const struct l64781_config* config;
         struct dvb_frontend frontend;
 
@@ -141,9 +140,9 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa
         u8 val0x06;
         int bw = p->bandwidth - BANDWIDTH_8_MHZ;
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, param);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, param);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         if (param->inversion != INVERSION_ON &&
@@ -509,7 +508,6 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &l64781_ops, sizeof(struct dvb_frontend_ops));
         state->first = 1;
 
         /**
@@ -555,7 +553,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
         }
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &l64781_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/lg_h06xf.h b/drivers/media/dvb/frontends/lg_h06xf.h
index c59fe418052..754d51d1112 100644
--- a/drivers/media/dvb/frontends/lg_h06xf.h
+++ b/drivers/media/dvb/frontends/lg_h06xf.h
@@ -29,8 +29,8 @@ static int lg_h06xf_pll_set(struct dvb_frontend* fe, struct i2c_adapter* i2c_ada
         int err;
 
         dvb_pll_configure(&dvb_pll_lg_tdvs_h06xf, buf, params->frequency, 0);
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if ((err = i2c_transfer(i2c_adap, &msg, 1)) != 1) {
                 printk(KERN_WARNING "lg_h06xf: %s error "
                         "(addr %02x <- %02x, err = %i)\n",
@@ -47,8 +47,8 @@ static int lg_h06xf_pll_set(struct dvb_frontend* fe, struct i2c_adapter* i2c_ada
         buf[0] |= 0x18;
         buf[1] = 0x50;
         msg.len = 2;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if ((err = i2c_transfer(i2c_adap, &msg, 1)) != 1) {
                 printk(KERN_WARNING "lg_h06xf: %s error "
                         "(addr %02x <- %02x, err = %i)\n",
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 5deb6445aca..53bafc7c9f9 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -60,7 +60,6 @@ if (debug) printk(KERN_DEBUG "lgdt330x: " args); \
 struct lgdt330x_state
 {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
 
         /* Configuration settings */
         const struct lgdt330x_config* config;
@@ -400,9 +399,9 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
         }
 
         /* Tune to the specified frequency */
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, param);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, param);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         /* Keep track of the new frequency */
@@ -724,16 +723,19 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
         /* Setup the state */
         state->config = config;
         state->i2c = i2c;
+
+        /* Create dvb_frontend */
         switch (config->demod_chip) {
         case LGDT3302:
-                memcpy(&state->ops, &lgdt3302_ops, sizeof(struct dvb_frontend_ops));
+                memcpy(&state->frontend.ops, &lgdt3302_ops, sizeof(struct dvb_frontend_ops));
                 break;
         case LGDT3303:
-                memcpy(&state->ops, &lgdt3303_ops, sizeof(struct dvb_frontend_ops));
+                memcpy(&state->frontend.ops, &lgdt3303_ops, sizeof(struct dvb_frontend_ops));
                 break;
         default:
                 goto error;
         }
+        state->frontend.demodulator_priv = state;
 
         /* Verify communication with demod chip */
         if (i2c_read_demod_bytes(state, 2, buf, 1))
@@ -742,9 +744,6 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
         state->current_frequency = -1;
         state->current_modulation = -1;
 
-        /* Create dvb_frontend */
-        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
         return &state->frontend;
 
 error:
diff --git a/drivers/media/dvb/frontends/lnbp21.c b/drivers/media/dvb/frontends/lnbp21.c
index c9152c1fbc3..e933edc8dd2 100644
--- a/drivers/media/dvb/frontends/lnbp21.c
+++ b/drivers/media/dvb/frontends/lnbp21.c
@@ -97,11 +97,11 @@ static void lnbp21_release(struct dvb_frontend *fe)
         lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);
 
         /* free data & call next release routine */
-        fe->ops->release = lnbp21->release_chain;
+        fe->ops.release = lnbp21->release_chain;
         kfree(fe->misc_priv);
         fe->misc_priv = NULL;
-        if (fe->ops->release)
-                fe->ops->release(fe);
+        if (fe->ops.release)
+                fe->ops.release(fe);
 }
 
 int lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)
@@ -129,12 +129,12 @@ int lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_
         }
 
         /* install release callback */
-        lnbp21->release_chain = fe->ops->release;
-        fe->ops->release = lnbp21_release;
+        lnbp21->release_chain = fe->ops.release;
+        fe->ops.release = lnbp21_release;
 
         /* override frontend ops */
-        fe->ops->set_voltage = lnbp21_set_voltage;
-        fe->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
+        fe->ops.set_voltage = lnbp21_set_voltage;
+        fe->ops.enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
 
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 46e12a8acf7..1ef82182564 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -39,7 +39,6 @@
 
 struct mt312_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         /* configuration settings */
         const struct mt312_config* config;
         struct dvb_frontend frontend;
@@ -471,16 +470,16 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
 
         dprintk("%s: Freq %d\n", __FUNCTION__, p->frequency);
 
-        if ((p->frequency < fe->ops->info.frequency_min)
-            || (p->frequency > fe->ops->info.frequency_max))
+        if ((p->frequency < fe->ops.info.frequency_min)
+            || (p->frequency > fe->ops.info.frequency_max))
                 return -EINVAL;
 
         if ((p->inversion < INVERSION_OFF)
             || (p->inversion > INVERSION_ON))
                 return -EINVAL;
 
-        if ((p->u.qpsk.symbol_rate < fe->ops->info.symbol_rate_min)
-            || (p->u.qpsk.symbol_rate > fe->ops->info.symbol_rate_max))
+        if ((p->u.qpsk.symbol_rate < fe->ops.info.symbol_rate_min)
+            || (p->u.qpsk.symbol_rate > fe->ops.info.symbol_rate_max))
                 return -EINVAL;
 
         if ((p->u.qpsk.fec_inner < FEC_NONE)
@@ -523,9 +522,9 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
                 return -EINVAL;
         }
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         /* sr = (u16)(sr * 256.0 / 1000000.0) */
@@ -670,19 +669,22 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
         if (mt312_readreg(state, ID, &state->id) < 0)
                 goto error;
 
+        /* create dvb_frontend */
+        memcpy(&state->frontend.ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+
         switch (state->id) {
         case ID_VP310:
-                strcpy(state->ops.info.name, "Zarlink VP310 DVB-S");
+                strcpy(state->frontend.ops.info.name, "Zarlink VP310 DVB-S");
                 state->frequency = 90;
                 break;
         case ID_MT312:
-                strcpy(state->ops.info.name, "Zarlink MT312 DVB-S");
+                strcpy(state->frontend.ops.info.name, "Zarlink MT312 DVB-S");
                 state->frequency = 60;
                 break;
         default:
@@ -690,9 +692,6 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
                 goto error;
         }
 
-        /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
         return &state->frontend;
 
 error:
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index 8601a3f4307..5de7376c94c 100644
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -45,7 +45,6 @@
 struct mt352_state {
         struct i2c_adapter* i2c;
         struct dvb_frontend frontend;
-        struct dvb_frontend_ops ops;
 
         /* configuration settings */
         struct mt352_config config;
@@ -288,17 +287,17 @@ static int mt352_set_parameters(struct dvb_frontend* fe,
         mt352_calc_input_freq(state, buf+6);
 
         if (state->config.no_tuner) {
-                if (fe->ops->tuner_ops.set_params) {
-                        fe->ops->tuner_ops.set_params(fe, param);
-                        if (fe->ops->i2c_gate_ctrl)
-                                fe->ops->i2c_gate_ctrl(fe, 0);
+                if (fe->ops.tuner_ops.set_params) {
+                        fe->ops.tuner_ops.set_params(fe, param);
+                        if (fe->ops.i2c_gate_ctrl)
+                                fe->ops.i2c_gate_ctrl(fe, 0);
                 }
 
                 mt352_write(fe, buf, 8);
                 mt352_write(fe, fsm_go, 2);
         } else {
-                if (fe->ops->tuner_ops.calc_regs) {
-                        fe->ops->tuner_ops.calc_regs(fe, param, buf+8, 5);
+                if (fe->ops.tuner_ops.calc_regs) {
+                        fe->ops.tuner_ops.calc_regs(fe, param, buf+8, 5);
                         buf[8] <<= 1;
                         mt352_write(fe, buf, sizeof(buf));
                         mt352_write(fe, tuner_go, 2);
@@ -550,13 +549,12 @@ struct dvb_frontend* mt352_attach(const struct mt352_config* config,
         /* setup the state */
         state->i2c = i2c;
         memcpy(&state->config,config,sizeof(struct mt352_config));
-        memcpy(&state->ops, &mt352_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
         if (mt352_read_register(state, CHIP_ID) != ID_MT352) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &mt352_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index 9b13f14f14f..55671cb5255 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -55,7 +55,6 @@
 struct nxt200x_state {
 
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         const struct nxt200x_config* config;
         struct dvb_frontend frontend;
 
@@ -548,8 +547,8 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
         }
 
         /* get tuning information */
-        if (fe->ops->tuner_ops.calc_regs) {
-                fe->ops->tuner_ops.calc_regs(fe, p, buf, 5);
+        if (fe->ops.tuner_ops.calc_regs) {
+                fe->ops.tuner_ops.calc_regs(fe, p, buf, 5);
         }
 
         /* set additional params */
@@ -1161,7 +1160,6 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops));
         state->initialised = 0;
 
         /* read card id */
@@ -1200,7 +1198,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
         }
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c
index bca83266ae8..d313d7dcf38 100644
--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -33,7 +33,6 @@
 
 struct nxt6000_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         /* configuration settings */
         const struct nxt6000_config* config;
         struct dvb_frontend frontend;
@@ -463,9 +462,9 @@ static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         struct nxt6000_state* state = fe->demodulator_priv;
         int result;
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, param);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, param);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         if ((result = nxt6000_set_bandwidth(state, param->u.ofdm.bandwidth)) < 0)
@@ -552,13 +551,12 @@ struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &nxt6000_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
         if (nxt6000_readreg(state, OFDM_MSC_REV) != NXT6000ASICDEVICE) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &nxt6000_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 19f75e6ed82..d20ab30c1e8 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -54,7 +54,6 @@ static int debug;
 struct or51132_state
 {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
 
         /* Configuration settings */
         const struct or51132_config* config;
@@ -383,9 +382,9 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
                 or51132_setmode(fe);
         }
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, param);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, param);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         /* Set to current mode */
@@ -618,12 +617,11 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
         /* Setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &or51132_ops, sizeof(struct dvb_frontend_ops));
         state->current_frequency = -1;
         state->current_modulation = -1;
 
         /* Create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &or51132_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
@@ -636,7 +634,7 @@ static struct dvb_frontend_ops or51132_ops = {
 
         .info = {
                 .name                   = "Oren OR51132 VSB/QAM Frontend",
-                .type                   = FE_ATSC,
+                .type                   = FE_ATSC,
                 .frequency_min          = 44000000,
                 .frequency_max          = 958000000,
                 .frequency_stepsize     = 166666,
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index 7c3aed1f546..26bed616fab 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -54,7 +54,6 @@ static u8 cmd_buf[] = {0x04,0x01,0x50,0x80,0x06}; // ATSC
 struct or51211_state {
 
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
 
         /* Configuration settings */
         const struct or51211_config* config;
@@ -585,12 +584,11 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config,
         /* Setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &or51211_ops, sizeof(struct dvb_frontend_ops));
         state->initialized = 0;
         state->current_frequency = 0;
 
         /* Create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &or51211_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index 5dee511544b..2c2c344c4c6 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -38,7 +38,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 struct s5h1420_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         const struct s5h1420_config* config;
         struct dvb_frontend frontend;
 
@@ -595,14 +594,14 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,
             (state->fec_inner == p->u.qpsk.fec_inner) &&
             (state->symbol_rate == p->u.qpsk.symbol_rate)) {
 
-                if (fe->ops->tuner_ops.set_params) {
-                        fe->ops->tuner_ops.set_params(fe, p);
-                        if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+                if (fe->ops.tuner_ops.set_params) {
+                        fe->ops.tuner_ops.set_params(fe, p);
+                        if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
                 }
-                if (fe->ops->tuner_ops.get_frequency) {
+                if (fe->ops.tuner_ops.get_frequency) {
                         u32 tmp;
-                        fe->ops->tuner_ops.get_frequency(fe, &tmp);
-                        if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+                        fe->ops.tuner_ops.get_frequency(fe, &tmp);
+                        if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
                         s5h1420_setfreqoffset(state, p->frequency - tmp);
                 } else {
                         s5h1420_setfreqoffset(state, 0);
@@ -652,9 +651,9 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,
         s5h1420_writereg(state, 0x05, s5h1420_readreg(state, 0x05) | 1);
 
         /* set tuner PLL */
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
                 s5h1420_setfreqoffset(state, 0);
         }
 
@@ -766,7 +765,6 @@ struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &s5h1420_ops, sizeof(struct dvb_frontend_ops));
         state->postlocked = 0;
         state->fclk = 88000000;
         state->tunedfreq = 0;
@@ -779,7 +777,7 @@ struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
                 goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &s5h1420_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 4d553c0dabb..44ec5b9a469 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -44,8 +44,6 @@ struct sp8870_state {
 
         struct i2c_adapter* i2c;
 
-        struct dvb_frontend_ops ops;
-
         const struct sp8870_config* config;
 
         struct dvb_frontend frontend;
@@ -262,9 +260,9 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,
         sp8870_microcontroller_stop(state);
 
         // set tuner parameters
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         // sample rate correction bit [23..17]
@@ -566,14 +564,13 @@ struct dvb_frontend* sp8870_attach(const struct sp8870_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &sp8870_ops, sizeof(struct dvb_frontend_ops));
         state->initialised = 0;
 
         /* check if the demod is there */
         if (sp8870_readreg(state, 0x0200) < 0) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &sp8870_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 543dfa14509..b0a2b02f660 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -24,7 +24,6 @@
 
 struct sp887x_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         const struct sp887x_config* config;
         struct dvb_frontend frontend;
 
@@ -353,13 +352,13 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,
         sp887x_microcontroller_stop(state);
 
         /* setup the PLL */
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
-        if (fe->ops->tuner_ops.get_frequency) {
-                fe->ops->tuner_ops.get_frequency(fe, &actual_freq);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.get_frequency) {
+                fe->ops.tuner_ops.get_frequency(fe, &actual_freq);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         } else {
                 actual_freq = p->frequency;
         }
@@ -564,14 +563,13 @@ struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &sp887x_ops, sizeof(struct dvb_frontend_ops));
         state->initialised = 0;
 
         /* check if the demod is there */
         if (sp887x_readreg(state, 0x0200) < 0) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &sp887x_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 0d74c2bfc99..1ca64249010 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -32,7 +32,6 @@
 
 struct stv0297_state {
         struct i2c_adapter *i2c;
-        struct dvb_frontend_ops ops;
         const struct stv0297_config *config;
         struct dvb_frontend frontend;
 
@@ -433,9 +432,9 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
         }
 
         stv0297_init(fe);
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         /* clear software interrupts */
@@ -649,7 +648,6 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &stv0297_ops, sizeof(struct dvb_frontend_ops));
         state->base_freq = 0;
 
         /* check if the demod is there */
@@ -657,7 +655,7 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,
                 goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &stv0297_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index e91bb5842dc..96648a75440 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -56,7 +56,6 @@
 
 struct stv0299_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         const struct stv0299_config* config;
         struct dvb_frontend frontend;
 
@@ -547,9 +546,9 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         if (state->config->invert) invval = (~invval) & 1;
         stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval);
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         stv0299_set_FEC (state, p->u.qpsk.fec_inner);
@@ -648,7 +647,6 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &stv0299_ops, sizeof(struct dvb_frontend_ops));
         state->initialised = 0;
         state->tuner_frequency = 0;
         state->symbol_rate = 0;
@@ -665,7 +663,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
         if (id != 0xa1 && id != 0x80) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &stv0299_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index c4299791719..e83ff2104c9 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -36,7 +36,6 @@
 
 struct tda10021_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         /* configuration settings */
         const struct tda10021_config* config;
         struct dvb_frontend frontend;
@@ -260,9 +259,9 @@ static int tda10021_set_parameters (struct dvb_frontend *fe,
 
         //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate);
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         tda10021_set_symbolrate (state, p->u.qam.symbol_rate);
@@ -421,7 +420,6 @@ struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &tda10021_ops, sizeof(struct dvb_frontend_ops));
         state->pwm = pwm;
         state->reg0 = tda10021_inittab[0];
 
@@ -429,7 +427,7 @@ struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,
         if ((tda10021_readreg(state, 0x1a) & 0xf0) != 0x70) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &tda10021_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 5288b44cf62..59a2ed614fc 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -47,7 +47,6 @@ enum tda1004x_demod {
 
 struct tda1004x_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         const struct tda1004x_config* config;
         struct dvb_frontend frontend;
 
@@ -695,9 +694,9 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
         }
 
         // set frequency
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, fe_params);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, fe_params);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         // Hardcoded to use auto as much as possible on the TDA10045 as it
@@ -1243,7 +1242,6 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &tda10045_ops, sizeof(struct dvb_frontend_ops));
         state->demod_type = TDA1004X_DEMOD_TDA10045;
 
         /* check if the demod is there */
@@ -1253,7 +1251,7 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
         }
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &tda10045_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 }
@@ -1302,7 +1300,6 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &tda10046_ops, sizeof(struct dvb_frontend_ops));
         state->demod_type = TDA1004X_DEMOD_TDA10046;
 
         /* check if the demod is there */
@@ -1312,7 +1309,7 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
         }
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &tda10046_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 }
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c
index 0aeaec89029..3aa45ebbac3 100644
--- a/drivers/media/dvb/frontends/tda8083.c
+++ b/drivers/media/dvb/frontends/tda8083.c
@@ -37,7 +37,6 @@
 
 struct tda8083_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         /* configuration settings */
         const struct tda8083_config* config;
         struct dvb_frontend frontend;
@@ -293,9 +292,9 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 {
         struct tda8083_state* state = fe->demodulator_priv;
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         tda8083_set_inversion (state, p->inversion);
@@ -397,13 +396,12 @@ struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &tda8083_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
         if ((tda8083_readreg(state, 0x00)) != 0x05) goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &tda8083_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 9810e2dcbbe..6bffe85c161 100644
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -35,7 +35,6 @@
 
 struct ves1820_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         /* configuration settings */
         const struct ves1820_config* config;
         struct dvb_frontend frontend;
@@ -220,9 +219,9 @@ static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_p
         if (real_qam < 0 || real_qam > 4)
                 return -EINVAL;
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         ves1820_set_symbolrate(state, p->u.qam.symbol_rate);
@@ -381,7 +380,6 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
                 goto error;
 
         /* setup the state */
-        memcpy(&state->ops, &ves1820_ops, sizeof(struct dvb_frontend_ops));
         state->reg0 = ves1820_inittab[0];
         state->config = config;
         state->i2c = i2c;
@@ -394,12 +392,12 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
         if (verbose)
                 printk("ves1820: pwm=0x%02x\n", state->pwm);
 
-        state->ops.info.symbol_rate_min = (state->config->xin / 2) / 64;      /* SACLK/64 == (XIN/2)/64 */
-        state->ops.info.symbol_rate_max = (state->config->xin / 2) / 4;       /* SACLK/4 */
-
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &ves1820_ops, sizeof(struct dvb_frontend_ops));
+        state->frontend.ops.info.symbol_rate_min = (state->config->xin / 2) / 64;      /* SACLK/64 == (XIN/2)/64 */
+        state->frontend.ops.info.symbol_rate_max = (state->config->xin / 2) / 4;       /* SACLK/4 */
         state->frontend.demodulator_priv = state;
+
         return &state->frontend;
 
 error:
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c
index 660aa7bb90d..54d7b07571b 100644
--- a/drivers/media/dvb/frontends/ves1x93.c
+++ b/drivers/media/dvb/frontends/ves1x93.c
@@ -36,7 +36,6 @@
 
 struct ves1x93_state {
         struct i2c_adapter* i2c;
-        struct dvb_frontend_ops ops;
         /* configuration settings */
         const struct ves1x93_config* config;
         struct dvb_frontend frontend;
@@ -389,9 +388,9 @@ static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 {
         struct ves1x93_state* state = fe->demodulator_priv;
 
-        if (fe->ops->tuner_ops.set_params) {
-                fe->ops->tuner_ops.set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
         ves1x93_set_inversion (state, p->inversion);
         ves1x93_set_fec (state, p->u.qpsk.fec_inner);
@@ -463,7 +462,6 @@ struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
-        memcpy(&state->ops, &ves1x93_ops, sizeof(struct dvb_frontend_ops));
         state->inversion = INVERSION_OFF;
 
         /* check if the demod is there + identify it */
@@ -498,7 +496,7 @@ struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
         }
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &ves1x93_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index ac39f551962..2b95e8b6cd3 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -34,7 +34,6 @@
 struct zl10353_state {
         struct i2c_adapter *i2c;
         struct dvb_frontend frontend;
-        struct dvb_frontend_ops ops;
 
         struct zl10353_config config;
 };
@@ -146,15 +145,15 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
         // if there is no attached secondary tuner, we call set_params to program
         // a potential tuner attached somewhere else
         if (state->config.no_tuner) {
-                if (fe->ops->tuner_ops.set_params) {
-                        fe->ops->tuner_ops.set_params(fe, param);
-                        if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+                if (fe->ops.tuner_ops.set_params) {
+                        fe->ops.tuner_ops.set_params(fe, param);
+                        if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
                 }
         }
 
         // if pllbuf is defined, retrieve the settings
-        if (fe->ops->tuner_ops.calc_regs) {
-                fe->ops->tuner_ops.calc_regs(fe, param, pllbuf+1, 5);
+        if (fe->ops.tuner_ops.calc_regs) {
+                fe->ops.tuner_ops.calc_regs(fe, param, pllbuf+1, 5);
                 pllbuf[1] <<= 1;
         } else {
                 // fake pllbuf settings
@@ -278,14 +277,13 @@ struct dvb_frontend *zl10353_attach(const struct zl10353_config *config,
         /* setup the state */
         state->i2c = i2c;
         memcpy(&state->config, config, sizeof(struct zl10353_config));
-        memcpy(&state->ops, &zl10353_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
         if (zl10353_read_register(state, CHIP_ID) != ID_ZL10353)
                 goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &zl10353_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
         return &state->frontend;
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 5cc609d986d..acabea0793b 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -473,8 +473,8 @@ static int lg_tdtpe001p_tuner_set_params(struct dvb_frontend *fe,
         msg.buf = buf;
         msg.len = sizeof(buf);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         ret = i2c_transfer(&pluto->i2c_adap, &msg, 1);
         if (ret < 0)
                 return ret;
@@ -511,12 +511,12 @@ static int __devinit frontend_init(struct pluto *pluto)
                 dev_err(&pluto->pdev->dev, "could not attach frontend\n");
                 return -ENODEV;
         }
-        pluto->fe->ops->tuner_ops.set_params = lg_tdtpe001p_tuner_set_params;
+        pluto->fe->ops.tuner_ops.set_params = lg_tdtpe001p_tuner_set_params;
 
         ret = dvb_register_frontend(&pluto->dvb_adapter, pluto->fe);
         if (ret < 0) {
-                if (pluto->fe->ops->release)
-                        pluto->fe->ops->release(pluto->fe);
+                if (pluto->fe->ops.release)
+                        pluto->fe->ops.release(pluto->fe);
                 return ret;
         }
 
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index be0a04caf92..8832f80c05f 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1575,8 +1575,8 @@ static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         // NOTE: since we're using a prescaler of 2, we set the
         // divisor frequency to 62.5kHz and divide by 125 above
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -1602,8 +1602,8 @@ static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         data[2] = 0x85 | ((div >> 10) & 0x60);
         data[3] = (params->frequency < 174000000 ? 0x88 : params->frequency < 470000000 ? 0x84 : 0x81);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -1632,8 +1632,8 @@ static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dv
         data[2] = 0x8e;
         data[3] = 0x00;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -1660,8 +1660,8 @@ static int philips_cd1516_tuner_set_params(struct dvb_frontend* fe, struct dvb_f
         data[2] = 0x8e;
         data[3] = (f < 174000000 ? 0xa1 : f < 470000000 ? 0x92 : 0x34);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -1695,8 +1695,8 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         data[2] = 0x85;
         data[3] = pwr << 6;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -1835,8 +1835,8 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_
         else
                 return -EINVAL;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) {
                 printk("nexusca: pll transfer failed!\n");
                 return -EIO;
@@ -1844,8 +1844,8 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_
 
         // wait for PLL lock
         for(i = 0; i < 20; i++) {
-                if (fe->ops->i2c_gate_ctrl)
-                        fe->ops->i2c_gate_ctrl(fe, 1);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
                 if (i2c_transfer(&av7110->i2c_adap, &readmsg, 1) == 1)
                         if (data[0] & 0x40) break;
                 msleep(10);
@@ -1891,8 +1891,8 @@ static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dv
         data[2] = ((div >> 10) & 0x60) | cfg;
         data[3] = (cpump << 6) | band_select;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1) return -EIO;
         return 0;
 }
@@ -2085,7 +2085,7 @@ static int frontend_init(struct av7110 *av7110)
                         av7110->fe = ves1820_attach(&philips_cd1516_config,
                                                     &av7110->i2c_adap, read_pwm(av7110));
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = philips_cd1516_tuner_set_params;
+                                av7110->fe->ops.tuner_ops.set_params = philips_cd1516_tuner_set_params;
                         }
                         break;
                 }
@@ -2099,10 +2099,10 @@ static int frontend_init(struct av7110 *av7110)
                         // try the ALPS BSRV2 first of all
                         av7110->fe = ves1x93_attach(&alps_bsrv2_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = alps_bsrv2_tuner_set_params;
-                                av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                                av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                                av7110->fe->ops->set_tone = av7110_set_tone;
+                                av7110->fe->ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;
+                                av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                                av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                                av7110->fe->ops.set_tone = av7110_set_tone;
                                 av7110->recover = dvb_s_recover;
                                 break;
                         }
@@ -2110,12 +2110,12 @@ static int frontend_init(struct av7110 *av7110)
                         // try the ALPS BSRU6 now
                         av7110->fe = stv0299_attach(&alps_bsru6_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = alps_bsru6_tuner_set_params;
+                                av7110->fe->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
                                 av7110->fe->tuner_priv = &av7110->i2c_adap;
 
-                                av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                                av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                                av7110->fe->ops->set_tone = av7110_set_tone;
+                                av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                                av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                                av7110->fe->ops.set_tone = av7110_set_tone;
                                 av7110->recover = dvb_s_recover;
                                 break;
                         }
@@ -2123,10 +2123,10 @@ static int frontend_init(struct av7110 *av7110)
                         // Try the grundig 29504-451
                         av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = grundig_29504_451_tuner_set_params;
-                                av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                                av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                                av7110->fe->ops->set_tone = av7110_set_tone;
+                                av7110->fe->ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;
+                                av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                                av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                                av7110->fe->ops.set_tone = av7110_set_tone;
                                 av7110->recover = dvb_s_recover;
                                 break;
                         }
@@ -2138,7 +2138,7 @@ static int frontend_init(struct av7110 *av7110)
                                 av7110->fe = ves1820_attach(&philips_cd1516_config, &av7110->i2c_adap,
                                                         read_pwm(av7110));
                                 if (av7110->fe) {
-                                        av7110->fe->ops->tuner_ops.set_params = philips_cd1516_tuner_set_params;
+                                        av7110->fe->ops.tuner_ops.set_params = philips_cd1516_tuner_set_params;
                                 }
                                 break;
                         case 0x0003:
@@ -2146,7 +2146,7 @@ static int frontend_init(struct av7110 *av7110)
                                 av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap,
                                                         read_pwm(av7110));
                                 if (av7110->fe) {
-                                        av7110->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+                                        av7110->fe->ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;
                                 }
                                 break;
                         }
@@ -2157,7 +2157,7 @@ static int frontend_init(struct av7110 *av7110)
                         // ALPS TDLB7
                         av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = alps_tdlb7_tuner_set_params;
+                                av7110->fe->ops.tuner_ops.set_params = alps_tdlb7_tuner_set_params;
                         }
                         break;
 
@@ -2165,7 +2165,7 @@ static int frontend_init(struct av7110 *av7110)
 
                         av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+                                av7110->fe->ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;
                         }
                         break;
 
@@ -2173,10 +2173,10 @@ static int frontend_init(struct av7110 *av7110)
                         /* ALPS BSRV2 */
                         av7110->fe = ves1x93_attach(&alps_bsrv2_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = alps_bsrv2_tuner_set_params;
-                                av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                                av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                                av7110->fe->ops->set_tone = av7110_set_tone;
+                                av7110->fe->ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;
+                                av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                                av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                                av7110->fe->ops.set_tone = av7110_set_tone;
                                 av7110->recover = dvb_s_recover;
                         }
                         break;
@@ -2185,10 +2185,10 @@ static int frontend_init(struct av7110 *av7110)
                         /* Grundig 29504-451 */
                         av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = grundig_29504_451_tuner_set_params;
-                                av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
-                                av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
-                                av7110->fe->ops->set_tone = av7110_set_tone;
+                                av7110->fe->ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;
+                                av7110->fe->ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
+                                av7110->fe->ops.diseqc_send_burst = av7110_diseqc_send_burst;
+                                av7110->fe->ops.set_tone = av7110_set_tone;
                                 av7110->recover = dvb_s_recover;
                         }
                         break;
@@ -2197,7 +2197,7 @@ static int frontend_init(struct av7110 *av7110)
 
                         av7110->fe = l64781_attach(&grundig_29504_401_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = grundig_29504_401_tuner_set_params;
+                                av7110->fe->ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params;
                         }
                         break;
 
@@ -2205,7 +2205,7 @@ static int frontend_init(struct av7110 *av7110)
 
                         av7110->fe = stv0297_attach(&nexusca_stv0297_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = nexusca_stv0297_tuner_set_params;
+                                av7110->fe->ops.tuner_ops.set_params = nexusca_stv0297_tuner_set_params;
 
                                 /* set TDA9819 into DVB mode */
                                 saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)
@@ -2221,16 +2221,16 @@ static int frontend_init(struct av7110 *av7110)
                         /* ALPS BSBE1 */
                         av7110->fe = stv0299_attach(&alps_bsbe1_config, &av7110->i2c_adap);
                         if (av7110->fe) {
-                                av7110->fe->ops->tuner_ops.set_params = alps_bsbe1_tuner_set_params;
+                                av7110->fe->ops.tuner_ops.set_params = alps_bsbe1_tuner_set_params;
                                 av7110->fe->tuner_priv = &av7110->i2c_adap;
 
                                 if (lnbp21_attach(av7110->fe, &av7110->i2c_adap, 0, 0)) {
                                         printk("dvb-ttpci: LNBP21 not found!\n");
-                                        if (av7110->fe->ops->release)
-                                                av7110->fe->ops->release(av7110->fe);
+                                        if (av7110->fe->ops.release)
+                                                av7110->fe->ops.release(av7110->fe);
                                         av7110->fe = NULL;
                                 } else {
-                                        av7110->fe->ops->dishnetwork_send_legacy_command = NULL;
+                                        av7110->fe->ops.dishnetwork_send_legacy_command = NULL;
                                         av7110->recover = dvb_s_recover;
                                 }
                         }
@@ -2247,21 +2247,21 @@ static int frontend_init(struct av7110 *av7110)
                        av7110->dev->pci->subsystem_vendor,
                        av7110->dev->pci->subsystem_device);
         } else {
-                FE_FUNC_OVERRIDE(av7110->fe->ops->init, av7110->fe_init, av7110_fe_init);
-                FE_FUNC_OVERRIDE(av7110->fe->ops->read_status, av7110->fe_read_status, av7110_fe_read_status);
-                FE_FUNC_OVERRIDE(av7110->fe->ops->diseqc_reset_overload, av7110->fe_diseqc_reset_overload, av7110_fe_diseqc_reset_overload);
-                FE_FUNC_OVERRIDE(av7110->fe->ops->diseqc_send_master_cmd, av7110->fe_diseqc_send_master_cmd, av7110_fe_diseqc_send_master_cmd);
-                FE_FUNC_OVERRIDE(av7110->fe->ops->diseqc_send_burst, av7110->fe_diseqc_send_burst, av7110_fe_diseqc_send_burst);
-                FE_FUNC_OVERRIDE(av7110->fe->ops->set_tone, av7110->fe_set_tone, av7110_fe_set_tone);
-                FE_FUNC_OVERRIDE(av7110->fe->ops->set_voltage, av7110->fe_set_voltage, av7110_fe_set_voltage;)
-                FE_FUNC_OVERRIDE(av7110->fe->ops->dishnetwork_send_legacy_command, av7110->fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);
-                FE_FUNC_OVERRIDE(av7110->fe->ops->set_frontend, av7110->fe_set_frontend, av7110_fe_set_frontend);
+                FE_FUNC_OVERRIDE(av7110->fe->ops.init, av7110->fe_init, av7110_fe_init);
+                FE_FUNC_OVERRIDE(av7110->fe->ops.read_status, av7110->fe_read_status, av7110_fe_read_status);
+                FE_FUNC_OVERRIDE(av7110->fe->ops.diseqc_reset_overload, av7110->fe_diseqc_reset_overload, av7110_fe_diseqc_reset_overload);
+                FE_FUNC_OVERRIDE(av7110->fe->ops.diseqc_send_master_cmd, av7110->fe_diseqc_send_master_cmd, av7110_fe_diseqc_send_master_cmd);
+                FE_FUNC_OVERRIDE(av7110->fe->ops.diseqc_send_burst, av7110->fe_diseqc_send_burst, av7110_fe_diseqc_send_burst);
+                FE_FUNC_OVERRIDE(av7110->fe->ops.set_tone, av7110->fe_set_tone, av7110_fe_set_tone);
+                FE_FUNC_OVERRIDE(av7110->fe->ops.set_voltage, av7110->fe_set_voltage, av7110_fe_set_voltage;)
+                FE_FUNC_OVERRIDE(av7110->fe->ops.dishnetwork_send_legacy_command, av7110->fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);
+                FE_FUNC_OVERRIDE(av7110->fe->ops.set_frontend, av7110->fe_set_frontend, av7110_fe_set_frontend);
 
                 ret = dvb_register_frontend(&av7110->dvb_adapter, av7110->fe);
                 if (ret < 0) {
                         printk("av7110: Frontend registration failed!\n");
-                        if (av7110->fe->ops->release)
-                                av7110->fe->ops->release(av7110->fe);
+                        if (av7110->fe->ops.release)
+                                av7110->fe->ops.release(av7110->fe);
                         av7110->fe = NULL;
                 }
         }
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 3ff67523cce..99ab6077885 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -541,8 +541,8 @@ static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe,
         else if (params->frequency < 2150000)
                 buf[3] |= 0xC0;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -662,22 +662,22 @@ static int philips_su1278sh2_tua6100_tuner_set_params(struct dvb_frontend *fe,
         reg0[1] |= 0x03;
 
         /* already enabled - do not reenable i2c repeater or TX fails */
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         msg.buf = reg0;
         msg.len = sizeof(reg0);
         if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1)
                 return -EIO;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         msg.buf = reg1;
         msg.len = sizeof(reg1);
         if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1)
                 return -EIO;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         msg.buf = reg2;
         msg.len = sizeof(reg2);
         if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1)
@@ -781,8 +781,8 @@ static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
         buf[3] = (params->frequency < 150000000 ? 0x01 :
                   params->frequency < 445000000 ? 0x02 : 0x04);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -802,8 +802,8 @@ static int philips_tu1216_tuner_init(struct dvb_frontend *fe)
         struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };
 
         // setup PLL configuration
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
         msleep(1);
@@ -885,8 +885,8 @@ static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
         tuner_buf[2] = 0xca;
         tuner_buf[3] = (cp << 5) | (filter << 3) | band;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
 
@@ -971,8 +971,8 @@ static int philips_sd1878_tda8261_tuner_set_params(struct dvb_frontend *fe,
                         params->frequency, 0);
         if(rc < 0) return rc;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if(i2c_transfer(&budget->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
 
@@ -1099,13 +1099,13 @@ static void frontend_init(struct budget_av *budget_av)
                         fe = stv0299_attach(&cinergy_1200s_1894_0010_config,
                                              &budget_av->budget.i2c_adap);
                         if (fe) {
-                                fe->ops->tuner_ops.set_params = philips_su1278sh2_tua6100_tuner_set_params;
+                                fe->ops.tuner_ops.set_params = philips_su1278sh2_tua6100_tuner_set_params;
                         }
                 } else {
                         fe = stv0299_attach(&typhoon_config,
                                              &budget_av->budget.i2c_adap);
                         if (fe) {
-                                fe->ops->tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;
+                                fe->ops.tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;
                         }
                 }
                 break;
@@ -1117,7 +1117,7 @@ static void frontend_init(struct budget_av *budget_av)
                 fe = stv0299_attach(&philips_sd1878_config,
                                 &budget_av->budget.i2c_adap);
                 if (fe) {
-                        fe->ops->tuner_ops.set_params = philips_sd1878_tda8261_tuner_set_params;
+                        fe->ops.tuner_ops.set_params = philips_sd1878_tda8261_tuner_set_params;
                 }
                 break;
 
@@ -1126,7 +1126,7 @@ static void frontend_init(struct budget_av *budget_av)
                 fe = stv0299_attach(&typhoon_config,
                                     &budget_av->budget.i2c_adap);
                 if (fe) {
-                        fe->ops->tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;
+                        fe->ops.tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;
                 }
                 break;
 
@@ -1134,7 +1134,7 @@ static void frontend_init(struct budget_av *budget_av)
                 fe = stv0299_attach(&cinergy_1200s_config,
                                     &budget_av->budget.i2c_adap);
                 if (fe) {
-                        fe->ops->tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;
+                        fe->ops.tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;
                 }
                 break;
 
@@ -1147,9 +1147,9 @@ static void frontend_init(struct budget_av *budget_av)
                                      read_pwm(budget_av));
                 if (fe) {
                         budget_av->tda10021_poclkp = 1;
-                        budget_av->tda10021_set_frontend = fe->ops->set_frontend;
-                        fe->ops->set_frontend = tda10021_set_frontend;
-                        fe->ops->tuner_ops.set_params = philips_cu1216_tuner_set_params;
+                        budget_av->tda10021_set_frontend = fe->ops.set_frontend;
+                        fe->ops.set_frontend = tda10021_set_frontend;
+                        fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
                 }
                 break;
 
@@ -1160,8 +1160,8 @@ static void frontend_init(struct budget_av *budget_av)
                 fe = tda10046_attach(&philips_tu1216_config,
                                      &budget_av->budget.i2c_adap);
                 if (fe) {
-                        fe->ops->tuner_ops.init = philips_tu1216_tuner_init;
-                        fe->ops->tuner_ops.set_params = philips_tu1216_tuner_set_params;
+                        fe->ops.tuner_ops.init = philips_tu1216_tuner_init;
+                        fe->ops.tuner_ops.set_params = philips_tu1216_tuner_set_params;
                 }
                 break;
         }
@@ -1181,8 +1181,8 @@ static void frontend_init(struct budget_av *budget_av)
         if (dvb_register_frontend(&budget_av->budget.dvb_adapter,
                                   budget_av->budget.dvb_frontend)) {
                 printk(KERN_ERR "budget-av: Frontend registration failed!\n");
-                if (budget_av->budget.dvb_frontend->ops->release)
-                        budget_av->budget.dvb_frontend->ops->release(budget_av->budget.dvb_frontend);
+                if (budget_av->budget.dvb_frontend->ops.release)
+                        budget_av->budget.dvb_frontend->ops.release(budget_av->budget.dvb_frontend);
                 budget_av->budget.dvb_frontend = NULL;
         }
 }
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index eb03b140b05..4b966eea383 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -649,8 +649,8 @@ static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe,
         else if (params->frequency < 2150000)
                 buf[3] |= 0xC0;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget_ci->budget.i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -680,8 +680,8 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe)
                         sizeof(td1316_init) };
 
         // setup PLL configuration
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget_ci->budget.i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
         msleep(1);
@@ -690,11 +690,11 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe)
         tuner_msg.addr = 0x65;
         tuner_msg.buf = disable_mc44BC374c;
         tuner_msg.len = sizeof(disable_mc44BC374c);
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget_ci->budget.i2c_adap, &tuner_msg, 1) != 1) {
-                if (fe->ops->i2c_gate_ctrl)
-                        fe->ops->i2c_gate_ctrl(fe, 1);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
                 i2c_transfer(&budget_ci->budget.i2c_adap, &tuner_msg, 1);
         }
 
@@ -777,8 +777,8 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb
         tuner_buf[2] = 0xca;
         tuner_buf[3] = (cp << 5) | (filter << 3) | band;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget_ci->budget.i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
 
@@ -863,15 +863,15 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
         tuner_buf[3] = (cp << 5) | (filter << 3) | band;
         tuner_buf[4] = 0x80;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget_ci->budget.i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
 
         msleep(50);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&budget_ci->budget.i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
 
@@ -990,7 +990,7 @@ static void frontend_init(struct budget_ci *budget_ci)
                 budget_ci->budget.dvb_frontend =
                         stv0299_attach(&alps_bsru6_config, &budget_ci->budget.i2c_adap);
                 if (budget_ci->budget.dvb_frontend) {
-                        budget_ci->budget.dvb_frontend->ops->tuner_ops.set_params = alps_bsru6_tuner_set_params;
+                        budget_ci->budget.dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
                         budget_ci->budget.dvb_frontend->tuner_priv = &budget_ci->budget.i2c_adap;
                         break;
                 }
@@ -1000,7 +1000,7 @@ static void frontend_init(struct budget_ci *budget_ci)
                 budget_ci->budget.dvb_frontend =
                         stv0299_attach(&philips_su1278_tt_config, &budget_ci->budget.i2c_adap);
                 if (budget_ci->budget.dvb_frontend) {
-                        budget_ci->budget.dvb_frontend->ops->tuner_ops.set_params = philips_su1278_tt_tuner_set_params;
+                        budget_ci->budget.dvb_frontend->ops.tuner_ops.set_params = philips_su1278_tt_tuner_set_params;
                         break;
                 }
                 break;
@@ -1010,7 +1010,7 @@ static void frontend_init(struct budget_ci *budget_ci)
                 budget_ci->budget.dvb_frontend =
                         stv0297_attach(&dvbc_philips_tdm1316l_config, &budget_ci->budget.i2c_adap);
                 if (budget_ci->budget.dvb_frontend) {
-                        budget_ci->budget.dvb_frontend->ops->tuner_ops.set_params = dvbc_philips_tdm1316l_tuner_set_params;
+                        budget_ci->budget.dvb_frontend->ops.tuner_ops.set_params = dvbc_philips_tdm1316l_tuner_set_params;
                         break;
                 }
                 break;
@@ -1020,8 +1020,8 @@ static void frontend_init(struct budget_ci *budget_ci)
                 budget_ci->budget.dvb_frontend =
                         tda10045_attach(&philips_tdm1316l_config, &budget_ci->budget.i2c_adap);
                 if (budget_ci->budget.dvb_frontend) {
-                        budget_ci->budget.dvb_frontend->ops->tuner_ops.init = philips_tdm1316l_tuner_init;
-                        budget_ci->budget.dvb_frontend->ops->tuner_ops.set_params = philips_tdm1316l_tuner_set_params;
+                        budget_ci->budget.dvb_frontend->ops.tuner_ops.init = philips_tdm1316l_tuner_init;
+                        budget_ci->budget.dvb_frontend->ops.tuner_ops.set_params = philips_tdm1316l_tuner_set_params;
                         break;
                 }
                 break;
@@ -1031,8 +1031,8 @@ static void frontend_init(struct budget_ci *budget_ci)
                 budget_ci->budget.dvb_frontend =
                         tda10046_attach(&philips_tdm1316l_config, &budget_ci->budget.i2c_adap);
                 if (budget_ci->budget.dvb_frontend) {
-                        budget_ci->budget.dvb_frontend->ops->tuner_ops.init = philips_tdm1316l_tuner_init;
-                        budget_ci->budget.dvb_frontend->ops->tuner_ops.set_params = philips_tdm1316l_tuner_set_params;
+                        budget_ci->budget.dvb_frontend->ops.tuner_ops.init = philips_tdm1316l_tuner_init;
+                        budget_ci->budget.dvb_frontend->ops.tuner_ops.set_params = philips_tdm1316l_tuner_set_params;
                         break;
                 }
                 break;
@@ -1040,14 +1040,14 @@ static void frontend_init(struct budget_ci *budget_ci)
         case 0x1017:            // TT S-1500 PCI
                 budget_ci->budget.dvb_frontend = stv0299_attach(&alps_bsbe1_config, &budget_ci->budget.i2c_adap);
                 if (budget_ci->budget.dvb_frontend) {
-                        budget_ci->budget.dvb_frontend->ops->tuner_ops.set_params = alps_bsbe1_tuner_set_params;
+                        budget_ci->budget.dvb_frontend->ops.tuner_ops.set_params = alps_bsbe1_tuner_set_params;
                         budget_ci->budget.dvb_frontend->tuner_priv = &budget_ci->budget.i2c_adap;
 
-                        budget_ci->budget.dvb_frontend->ops->dishnetwork_send_legacy_command = NULL;
+                        budget_ci->budget.dvb_frontend->ops.dishnetwork_send_legacy_command = NULL;
                         if (lnbp21_attach(budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, LNBP21_LLC, 0)) {
                                 printk("%s: No LNBP21 found!\n", __FUNCTION__);
-                                if (budget_ci->budget.dvb_frontend->ops->release)
-                                        budget_ci->budget.dvb_frontend->ops->release(budget_ci->budget.dvb_frontend);
+                                if (budget_ci->budget.dvb_frontend->ops.release)
+                                        budget_ci->budget.dvb_frontend->ops.release(budget_ci->budget.dvb_frontend);
                                 budget_ci->budget.dvb_frontend = NULL;
                         }
                 }
@@ -1065,8 +1065,8 @@ static void frontend_init(struct budget_ci *budget_ci)
                 if (dvb_register_frontend
                     (&budget_ci->budget.dvb_adapter, budget_ci->budget.dvb_frontend)) {
                         printk("budget-ci: Frontend registration failed!\n");
-                        if (budget_ci->budget.dvb_frontend->ops->release)
-                                budget_ci->budget.dvb_frontend->ops->release(budget_ci->budget.dvb_frontend);
+                        if (budget_ci->budget.dvb_frontend->ops.release)
+                                budget_ci->budget.dvb_frontend->ops.release(budget_ci->budget.dvb_frontend);
                         budget_ci->budget.dvb_frontend = NULL;
                 }
         }
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 3515f524176..ee60ce90a40 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -281,8 +281,8 @@ static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         // NOTE: since we're using a prescaler of 2, we set the
         // divisor frequency to 62.5kHz and divide by 125 above
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -307,8 +307,8 @@ static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dv
         data[2] = 0x8e;
         data[3] = 0x00;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -327,32 +327,32 @@ static void frontend_init(struct budget_patch* budget)
                 // try the ALPS BSRV2 first of all
                 budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = alps_bsrv2_tuner_set_params;
-                        budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops->diseqc_send_burst = budget_patch_diseqc_send_burst;
-                        budget->dvb_frontend->ops->set_tone = budget_patch_set_tone;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;
+                        budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd;
+                        budget->dvb_frontend->ops.diseqc_send_burst = budget_patch_diseqc_send_burst;
+                        budget->dvb_frontend->ops.set_tone = budget_patch_set_tone;
                         break;
                 }
 
                 // try the ALPS BSRU6 now
                 budget->dvb_frontend = stv0299_attach(&alps_bsru6_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = alps_bsru6_tuner_set_params;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
                         budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
 
-                        budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
-                        budget->dvb_frontend->ops->set_tone = budget_set_tone;
+                        budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
+                        budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst;
+                        budget->dvb_frontend->ops.set_tone = budget_set_tone;
                         break;
                 }
 
                 // Try the grundig 29504-451
                 budget->dvb_frontend = tda8083_attach(&grundig_29504_451_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = grundig_29504_451_tuner_set_params;
-                        budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
-                        budget->dvb_frontend->ops->set_tone = budget_set_tone;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;
+                        budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
+                        budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst;
+                        budget->dvb_frontend->ops.set_tone = budget_set_tone;
                         break;
                 }
                 break;
@@ -367,8 +367,8 @@ static void frontend_init(struct budget_patch* budget)
         } else {
                 if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) {
                         printk("budget-av: Frontend registration failed!\n");
-                        if (budget->dvb_frontend->ops->release)
-                                budget->dvb_frontend->ops->release(budget->dvb_frontend);
+                        if (budget->dvb_frontend->ops.release)
+                                budget->dvb_frontend->ops.release(budget->dvb_frontend);
                         budget->dvb_frontend = NULL;
                 }
         }
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index d98395fefc9..35761f13c12 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -209,8 +209,8 @@ static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         // NOTE: since we're using a prescaler of 2, we set the
         // divisor frequency to 62.5kHz and divide by 125 above
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
         return 0;
 }
@@ -236,8 +236,8 @@ static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         data[2] = 0x85 | ((div >> 10) & 0x60);
         data[3] = (params->frequency < 174000000 ? 0x88 : params->frequency < 470000000 ? 0x84 : 0x81);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
         return 0;
 }
@@ -276,8 +276,8 @@ static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dv
         data[2] = ((div >> 10) & 0x60) | cfg;
         data[3] = (cpump << 6) | band_select;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
         return 0;
 }
@@ -299,8 +299,8 @@ static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dv
         data[2] = 0x8e;
         data[3] = 0x00;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
         return 0;
 }
@@ -330,8 +330,8 @@ static int s5h1420_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend
         else
                 data[3] = 0xc0;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
 
         return 0;
@@ -363,21 +363,21 @@ static void frontend_init(struct budget *budget)
                 // try the ALPS BSRV2 first of all
                 budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = alps_bsrv2_tuner_set_params;
-                        budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
-                        budget->dvb_frontend->ops->set_tone = budget_set_tone;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;
+                        budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
+                        budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst;
+                        budget->dvb_frontend->ops.set_tone = budget_set_tone;
                         break;
                 }
 
                 // try the ALPS BSRU6 now
                 budget->dvb_frontend = stv0299_attach(&alps_bsru6_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = alps_bsru6_tuner_set_params;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
                         budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
-                        budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
-                        budget->dvb_frontend->ops->set_tone = budget_set_tone;
+                        budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
+                        budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst;
+                        budget->dvb_frontend->ops.set_tone = budget_set_tone;
                         break;
                 }
                 break;
@@ -386,7 +386,7 @@ static void frontend_init(struct budget *budget)
 
                 budget->dvb_frontend = ves1820_attach(&alps_tdbe2_config, &budget->i2c_adap, read_pwm(budget));
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;
                         break;
                 }
                 break;
@@ -395,7 +395,7 @@ static void frontend_init(struct budget *budget)
 
                 budget->dvb_frontend = l64781_attach(&grundig_29504_401_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = grundig_29504_401_tuner_set_params;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params;
                         break;
                 }
                 break;
@@ -403,26 +403,26 @@ static void frontend_init(struct budget *budget)
         case 0x4f60: // Fujitsu Siemens Activy Budget-S PCI rev AL (stv0299/ALPS BSRU6(tsa5059))
                 budget->dvb_frontend = stv0299_attach(&alps_bsru6_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = alps_bsru6_tuner_set_params;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
                         budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
-                        budget->dvb_frontend->ops->set_voltage = siemens_budget_set_voltage;
-                        budget->dvb_frontend->ops->dishnetwork_send_legacy_command = NULL;
+                        budget->dvb_frontend->ops.set_voltage = siemens_budget_set_voltage;
+                        budget->dvb_frontend->ops.dishnetwork_send_legacy_command = NULL;
                 }
                 break;
 
         case 0x4f61: // Fujitsu Siemens Activy Budget-S PCI rev GR (tda8083/Grundig 29504-451(tsa5522))
                 budget->dvb_frontend = tda8083_attach(&grundig_29504_451_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = grundig_29504_451_tuner_set_params;
-                        budget->dvb_frontend->ops->set_voltage = siemens_budget_set_voltage;
-                        budget->dvb_frontend->ops->dishnetwork_send_legacy_command = NULL;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;
+                        budget->dvb_frontend->ops.set_voltage = siemens_budget_set_voltage;
+                        budget->dvb_frontend->ops.dishnetwork_send_legacy_command = NULL;
                 }
                 break;
 
         case 0x1016: // Hauppauge/TT Nova-S SE (samsung s5h1420/????(tda8260))
                 budget->dvb_frontend = s5h1420_attach(&s5h1420_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->tuner_ops.set_params = s5h1420_tuner_set_params;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = s5h1420_tuner_set_params;
                         if (lnbp21_attach(budget->dvb_frontend, &budget->i2c_adap, 0, 0)) {
                                 printk("%s: No LNBP21 found!\n", __FUNCTION__);
                                 goto error_out;
@@ -445,8 +445,8 @@ static void frontend_init(struct budget *budget)
 
 error_out:
         printk("budget: Frontend registration failed!\n");
-        if (budget->dvb_frontend->ops->release)
-                budget->dvb_frontend->ops->release(budget->dvb_frontend);
+        if (budget->dvb_frontend->ops.release)
+                budget->dvb_frontend->ops.release(budget->dvb_frontend);
         budget->dvb_frontend = NULL;
         return;
 }
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index e540dacf5ce..14559ef6153 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1039,8 +1039,8 @@ static int alps_tdmb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         data[2] = ((div >> 10) & 0x60) | 0x85;
         data[3] = params->frequency < 592000000 ? 0x40 : 0x80;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&ttusb->i2c_adap, &msg, 1) != 1) return -EIO;
         return 0;
 }
@@ -1061,8 +1061,8 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend* fe)
         struct i2c_msg tuner_msg = { .addr=0x60, .flags=0, .buf=td1316_init, .len=sizeof(td1316_init) };
 
         // setup PLL configuration
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&ttusb->i2c_adap, &tuner_msg, 1) != 1) return -EIO;
         msleep(1);
 
@@ -1070,8 +1070,8 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend* fe)
         tuner_msg.addr = 0x65;
         tuner_msg.buf = disable_mc44BC374c;
         tuner_msg.len = sizeof(disable_mc44BC374c);
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&ttusb->i2c_adap, &tuner_msg, 1) != 1) {
                 i2c_transfer(&ttusb->i2c_adap, &tuner_msg, 1);
         }
@@ -1139,8 +1139,8 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb
         tuner_buf[2] = 0xca;
         tuner_buf[3] = (cp << 5) | (filter << 3) | band;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&ttusb->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
 
@@ -1304,8 +1304,8 @@ static int philips_tsa5059_tuner_set_params(struct dvb_frontend *fe, struct dvb_
         if (ttusb->revision == TTUSB_REV_2_2)
                 buf[3] |= 0x20;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&ttusb->i2c_adap, &msg, 1) != 1)
                 return -EIO;
 
@@ -1338,8 +1338,8 @@ static int ttusb_novas_grundig_29504_491_tuner_set_params(struct dvb_frontend *f
         buf[2] = 0x8e;
         buf[3] = 0x00;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&ttusb->i2c_adap, &msg, 1) != 1)
                 return -EIO;
 
@@ -1365,8 +1365,8 @@ static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_front
         data[2] = 0x85 | ((div >> 10) & 0x60);
         data[3] = (params->frequency < 174000000 ? 0x88 : params->frequency < 470000000 ? 0x84 : 0x81);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer (&ttusb->i2c_adap, &msg, 1) != 1)
                 return -EIO;
 
@@ -1434,8 +1434,8 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
         tuner_buf[3] = (cp << 5) | (filter << 3) | band;
         tuner_buf[4] = 0x80;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&ttusb->i2c_adap, &tuner_msg, 1) != 1) {
                 printk("dvb-ttusb-budget: dvbc_philips_tdm1316l_pll_set Error 1\n");
                 return -EIO;
@@ -1443,8 +1443,8 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
 
         msleep(50);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&ttusb->i2c_adap, &tuner_msg, 1) != 1) {
                 printk("dvb-ttusb-budget: dvbc_philips_tdm1316l_pll_set Error 2\n");
                 return -EIO;
@@ -1570,13 +1570,13 @@ static void frontend_init(struct ttusb* ttusb)
                 // try the stv0299 based first
                 ttusb->fe = stv0299_attach(&alps_stv0299_config, &ttusb->i2c_adap);
                 if (ttusb->fe != NULL) {
-                        ttusb->fe->ops->tuner_ops.set_params = philips_tsa5059_tuner_set_params;
+                        ttusb->fe->ops.tuner_ops.set_params = philips_tsa5059_tuner_set_params;
 
                         if(ttusb->revision == TTUSB_REV_2_2) { // ALPS BSBE1
                                 alps_stv0299_config.inittab = alps_bsbe1_inittab;
                                 lnbp21_attach(ttusb->fe, &ttusb->i2c_adap, 0, 0);
                         } else { // ALPS BSRU6
-                                ttusb->fe->ops->set_voltage = ttusb_set_voltage;
+                                ttusb->fe->ops.set_voltage = ttusb_set_voltage;
                         }
                         break;
                 }
@@ -1584,8 +1584,8 @@ static void frontend_init(struct ttusb* ttusb)
                 // Grundig 29504-491
                 ttusb->fe = tda8083_attach(&ttusb_novas_grundig_29504_491_config, &ttusb->i2c_adap);
                 if (ttusb->fe != NULL) {
-                        ttusb->fe->ops->tuner_ops.set_params = ttusb_novas_grundig_29504_491_tuner_set_params;
-                        ttusb->fe->ops->set_voltage = ttusb_set_voltage;
+                        ttusb->fe->ops.tuner_ops.set_params = ttusb_novas_grundig_29504_491_tuner_set_params;
+                        ttusb->fe->ops.set_voltage = ttusb_set_voltage;
                         break;
                 }
                 break;
@@ -1593,13 +1593,13 @@ static void frontend_init(struct ttusb* ttusb)
         case 0x1004: // Hauppauge/TT DVB-C budget (ves1820/ALPS TDBE2(sp5659))
                 ttusb->fe = ves1820_attach(&alps_tdbe2_config, &ttusb->i2c_adap, read_pwm(ttusb));
                 if (ttusb->fe != NULL) {
-                        ttusb->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+                        ttusb->fe->ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;
                         break;
                 }
 
                 ttusb->fe = stv0297_attach(&dvbc_philips_tdm1316l_config, &ttusb->i2c_adap);
                 if (ttusb->fe != NULL) {
-                        ttusb->fe->ops->tuner_ops.set_params = dvbc_philips_tdm1316l_tuner_set_params;
+                        ttusb->fe->ops.tuner_ops.set_params = dvbc_philips_tdm1316l_tuner_set_params;
                         break;
                 }
                 break;
@@ -1608,15 +1608,15 @@ static void frontend_init(struct ttusb* ttusb)
                 // try the ALPS TDMB7 first
                 ttusb->fe = cx22700_attach(&alps_tdmb7_config, &ttusb->i2c_adap);
                 if (ttusb->fe != NULL) {
-                        ttusb->fe->ops->tuner_ops.set_params = alps_tdmb7_tuner_set_params;
+                        ttusb->fe->ops.tuner_ops.set_params = alps_tdmb7_tuner_set_params;
                         break;
                 }
 
                 // Philips td1316
                 ttusb->fe = tda10046_attach(&philips_tdm1316l_config, &ttusb->i2c_adap);
                 if (ttusb->fe != NULL) {
-                        ttusb->fe->ops->tuner_ops.init = philips_tdm1316l_tuner_init;
-                        ttusb->fe->ops->tuner_ops.set_params = philips_tdm1316l_tuner_set_params;
+                        ttusb->fe->ops.tuner_ops.init = philips_tdm1316l_tuner_init;
+                        ttusb->fe->ops.tuner_ops.set_params = philips_tdm1316l_tuner_set_params;
                         break;
                 }
                 break;
@@ -1629,8 +1629,8 @@ static void frontend_init(struct ttusb* ttusb)
         } else {
                 if (dvb_register_frontend(&ttusb->adapter, ttusb->fe)) {
                         printk("dvb-ttusb-budget: Frontend registration failed!\n");
-                        if (ttusb->fe->ops->release)
-                                ttusb->fe->ops->release(ttusb->fe);
+                        if (ttusb->fe->ops.release)
+                                ttusb->fe->ops.release(ttusb->fe);
                         ttusb->fe = NULL;
                 }
         }
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index da1090afad5..6c1cb770bcf 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1657,8 +1657,8 @@ static int ttusb_dec_probe(struct usb_interface *intf,
         } else {
                 if (dvb_register_frontend(&dec->adapter, dec->fe)) {
                         printk("budget-ci: Frontend registration failed!\n");
-                        if (dec->fe->ops->release)
-                                dec->fe->ops->release(dec->fe);
+                        if (dec->fe->ops.release)
+                                dec->fe->ops.release(dec->fe);
                         dec->fe = NULL;
                 }
         }
diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
index a5a46175fa0..42f39a89bc4 100644
--- a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
+++ b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
@@ -28,8 +28,6 @@
 
 struct ttusbdecfe_state {
 
-        struct dvb_frontend_ops ops;
-
         /* configuration settings */
         const struct ttusbdecfe_config* config;
 
@@ -203,10 +201,9 @@ struct dvb_frontend* ttusbdecfe_dvbt_attach(const struct ttusbdecfe_config* conf
 
         /* setup the state */
         state->config = config;
-        memcpy(&state->ops, &ttusbdecfe_dvbt_ops, sizeof(struct dvb_frontend_ops));
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &ttusbdecfe_dvbt_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 }
@@ -226,10 +223,9 @@ struct dvb_frontend* ttusbdecfe_dvbs_attach(const struct ttusbdecfe_config* conf
         state->config = config;
         state->voltage = 0;
         state->hi_band = 0;
-        memcpy(&state->ops, &ttusbdecfe_dvbs_ops, sizeof(struct dvb_frontend_ops));
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &ttusbdecfe_dvbs_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
 }
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 4d369f8393d..bf89cbf2b05 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -230,8 +230,8 @@ static int philips_fmd1216_pll_init(struct dvb_frontend *fe)
                   .buf = fmd1216_init, .len = sizeof(fmd1216_init) };
         int err;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
                 if (err < 0)
                         return err;
@@ -261,8 +261,8 @@ static int dntv_live_dvbt_pro_tuner_set_params(struct dvb_frontend* fe,
         dvb_pll_configure(dev->core->pll_desc, buf,
                           params->frequency,
                           params->u.ofdm.bandwidth);
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
 
                 printk(KERN_WARNING "cx88-dvb: %s error "
@@ -300,8 +300,8 @@ static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
                           params->frequency,
                           params->u.ofdm.bandwidth);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
                 printk(KERN_WARNING "cx88-dvb: %s error "
                            "(addr %02x <- %02x, err = %i)\n",
@@ -375,8 +375,8 @@ static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
         dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
                         __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if ((err = i2c_transfer(&core->i2c_adap, &msg, 1)) != 1) {
                 printk(KERN_WARNING "cx88-dvb: %s error "
                            "(addr %02x <- %02x, err = %i)\n",
@@ -586,7 +586,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = mt352_attach(&dntv_live_dvbt_pro_config,
                         &((struct vp3054_i2c_state *)dev->card_priv)->adap);
                 if (dev->dvb.frontend != NULL) {
-                        dev->dvb.frontend->ops->tuner_ops.set_params = dntv_live_dvbt_pro_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = dntv_live_dvbt_pro_tuner_set_params;
                 }
 #else
                 printk("%s: built without vp3054 support\n", dev->core->name);
@@ -609,7 +609,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_hybrid,
                                                    &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dev->dvb.frontend->ops->tuner_ops.set_params = dvico_hybrid_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params;
                 }
                 break;
 #endif
@@ -641,7 +641,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_3_gold,
                                                     &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dev->dvb.frontend->ops->tuner_ops.set_params = lgdt3302_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
                 }
                 }
                 break;
@@ -660,7 +660,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_3_gold,
                                                     &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dev->dvb.frontend->ops->tuner_ops.set_params = lgdt3302_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
                 }
                 }
                 break;
@@ -677,7 +677,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_5_gold,
                                                     &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dev->dvb.frontend->ops->tuner_ops.set_params = lgdt3303_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
                 }
                 }
                 break;
@@ -694,7 +694,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = lgdt330x_attach(&pchdtv_hd5500,
                                                     &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dev->dvb.frontend->ops->tuner_ops.set_params = lgdt3303_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
                 }
                 }
                 break;
@@ -721,8 +721,8 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = cx24123_attach(&kworld_dvbs_100_config,
                         &dev->core->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->core->prev_set_voltage = dev->dvb.frontend->ops->set_voltage;
-                        dev->dvb.frontend->ops->set_voltage = kworld_dvbs_100_set_voltage;
+                        dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage;
                 }
                 break;
 #endif
@@ -737,8 +737,8 @@ static int dvb_register(struct cx8802_dev *dev)
         }
 
         if (dev->core->pll_desc) {
-                dev->dvb.frontend->ops->info.frequency_min = dev->core->pll_desc->min;
-                dev->dvb.frontend->ops->info.frequency_max = dev->core->pll_desc->max;
+                dev->dvb.frontend->ops.info.frequency_min = dev->core->pll_desc->min;
+                dev->dvb.frontend->ops.info.frequency_max = dev->core->pll_desc->max;
         }
 
         /* Put the analog decoder in standby to keep it quiet */
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index f720901e963..7efa6def0bd 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -138,13 +138,13 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
                 return;
 
         if (core->dvbdev) {
-                if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
-                        core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);
+                if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl)
+                        core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);
 
                 i2c_clients_command(&core->i2c_adap, cmd, arg);
 
-                if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
-                        core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0);
+                if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl)
+                        core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0);
         } else
                 i2c_clients_command(&core->i2c_adap, cmd, arg);
 }
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 716b829c460..279828b8f29 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -146,13 +146,13 @@ static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe,
         f.tuner     = 0;
         f.type      = V4L2_TUNER_DIGITAL_TV;
         f.frequency = params->frequency / 1000 * 16 / 1000;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &msg, 1);
         saa7134_i2c_call_clients(dev,VIDIOC_S_FREQUENCY,&f);
         msg.buf = on;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &msg, 1);
 
         pinnacle_antenna_pwr(dev, antenna_pwr);
@@ -266,8 +266,8 @@ static int philips_tda6651_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb_
         tuner_buf[2] = 0xca;
         tuner_buf[3] = (cp << 5) | (filter << 3) | band;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
         msleep(1);
@@ -281,8 +281,8 @@ static int philips_tda6651_pll_init(u8 addr, struct dvb_frontend *fe)
         struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };
 
         /* setup PLL configuration */
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
         msleep(1);
@@ -352,8 +352,8 @@ static int philips_europa_tuner_init(struct dvb_frontend *fe)
         struct i2c_msg init_msg = {.addr = 0x61,.flags = 0,.buf = msg,.len = sizeof(msg) };
 
         /* setup PLL configuration */
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&dev->i2c_adap, &init_msg, 1) != 1)
                 return -EIO;
         msleep(1);
@@ -363,8 +363,8 @@ static int philips_europa_tuner_init(struct dvb_frontend *fe)
         init_msg.len  = 0x02;
         msg[0] = 0x00;
         msg[1] = 0x40;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&dev->i2c_adap, &init_msg, 1) != 1)
                 return -EIO;
 
@@ -391,8 +391,8 @@ static int philips_europa_tuner_sleep(struct dvb_frontend *fe)
         analog_msg.len  = 0x02;
         msg[0] = 0x00;
         msg[1] = 0x14;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &analog_msg, 1);
         return 0;
 }
@@ -403,7 +403,7 @@ static int philips_europa_demod_sleep(struct dvb_frontend *fe)
 
         if (dev->original_demod_sleep)
                 dev->original_demod_sleep(fe);
-        fe->ops->i2c_gate_ctrl(fe, 1);
+        fe->ops.i2c_gate_ctrl(fe, 1);
         return 0;
 }
 
@@ -427,8 +427,8 @@ static int philips_fmd1216_tuner_init(struct dvb_frontend *fe)
         static u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0xa0 };
         struct i2c_msg tuner_msg = {.addr = 0x61,.flags = 0,.buf = fmd1216_init,.len = sizeof(fmd1216_init) };
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
         msleep(1);
@@ -443,14 +443,14 @@ static int philips_fmd1216_tuner_sleep(struct dvb_frontend *fe)
         static u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0x60 };
         struct i2c_msg tuner_msg = {.addr = 0x61,.flags = 0,.buf = fmd1216_init,.len = sizeof(fmd1216_init) };
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
         msleep(1);
         fmd1216_init[2] = 0x86;
         fmd1216_init[3] = 0x54;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
         msleep(1);
         return 0;
@@ -533,8 +533,8 @@ static int philips_fmd1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_
         tuner_buf[2] = 0x80 | (cp << 6) | (mode  << 3) | 4;
         tuner_buf[3] = 0x40 | band;
 
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
         return 0;
@@ -646,8 +646,8 @@ static int philips_tda827x_tuner_set_params(struct dvb_frontend *fe, struct dvb_
         tuner_buf[13] = 0x40;
 
         tuner_msg.len = 14;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
                 return -EIO;
 
@@ -656,8 +656,8 @@ static int philips_tda827x_tuner_set_params(struct dvb_frontend *fe, struct dvb_
         tuner_buf[0] = 0x30;
         tuner_buf[1] = 0x50 + tda827x_dvbt[i].cp;
         tuner_msg.len = 2;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
 
         return 0;
@@ -669,8 +669,8 @@ static int philips_tda827x_tuner_sleep(struct dvb_frontend *fe)
         static u8 tda827x_sleep[] = { 0x30, 0xd0};
         struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep,
                                     .len = sizeof(tda827x_sleep) };
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
         return 0;
 }
@@ -773,8 +773,8 @@ static int philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb
         tuner_buf[12] = 0x00;
         tuner_buf[13] = 0x39;  // lpsel
         msg.len = 14;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
                 return -EIO;
 
@@ -782,14 +782,14 @@ static int philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb
         msg.len = 2;
         reg2[0] = 0x60;
         reg2[1] = 0x3c;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &msg, 1);
 
         reg2[0] = 0xa0;
         reg2[1] = 0x40;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &msg, 1);
 
         msleep(2);
@@ -797,15 +797,15 @@ static int philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb
         reg2[0] = 0x30;
         reg2[1] = 0x10 + tda827xa_dvbt[i].scr;
         msg.len = 2;
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &msg, 1);
 
         msleep(550);
         reg2[0] = 0x50;
         reg2[1] = 0x4f + (tda827xa_dvbt[i].gc3 << 4);
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &msg, 1);
 
         return 0;
@@ -818,8 +818,8 @@ static int philips_tda827xa_tuner_sleep(u8 addr, struct dvb_frontend *fe)
         static u8 tda827xa_sleep[] = { 0x30, 0x90};
         struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tda827xa_sleep,
                                     .len = sizeof(tda827xa_sleep) };
-        if (fe->ops->i2c_gate_ctrl)
-                fe->ops->i2c_gate_ctrl(fe, 1);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
         i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
         return 0;
 }
@@ -1015,7 +1015,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 dev->dvb.frontend = mt352_attach(&pinnacle_300i,
                                                  &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.set_params = mt352_pinnacle_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;
                 }
                 break;
 
@@ -1024,7 +1024,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 dev->dvb.frontend = mt352_attach(&avermedia_777,
                                                  &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs;
+                        dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs;
                 }
                 break;
 #endif
@@ -1033,124 +1033,124 @@ static int dvb_init(struct saa7134_dev *dev)
                 dev->dvb.frontend = tda10046_attach(&medion_cardbus,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_fmd1216_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = philips_fmd1216_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_fmd1216_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_TOUGH:
                 dev->dvb.frontend = tda10046_attach(&philips_tu1216_60_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_tu1216_tuner_60_init;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_tu1216_tuner_60_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_60_init;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_60_set_params;
                 }
                 break;
         case SAA7134_BOARD_FLYDVBTDUO:
                 dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_tda827x_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = philips_tda827x_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_tda827x_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda827x_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS:
                 dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_tda827x_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = philips_tda827x_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_tda827x_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda827x_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_EUROPA:
                 dev->dvb.frontend = tda10046_attach(&philips_europa_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->original_demod_sleep = dev->dvb.frontend->ops->sleep;
-                        dev->dvb.frontend->ops->sleep = philips_europa_demod_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_europa_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = philips_europa_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_td1316_tuner_set_params;
+                        dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
+                        dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_300:
                 dev->dvb.frontend = tda10046_attach(&philips_europa_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_europa_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = philips_europa_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_td1316_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_200:
                 dev->dvb.frontend = tda10046_attach(&philips_tu1216_61_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_tu1216_tuner_61_init;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_tu1216_tuner_61_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_61_init;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tu1216_tuner_61_set_params;
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_TIGER:
                 dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_tiger_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = philips_tiger_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_tiger_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tiger_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
                 dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_tiger_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = philips_tiger_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_tiger_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tiger_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_FLYDVBT_LR301:
                 dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = philips_tda827x_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = philips_tda827x_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = philips_tda827x_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda827x_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_FLYDVB_TRIO:
                 dev->dvb.frontend = tda10046_attach(&lifeview_trio_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.sleep = lifeview_trio_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = lifeview_trio_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = lifeview_trio_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = lifeview_trio_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:
                 dev->dvb.frontend = tda10046_attach(&ads_tech_duo_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = ads_duo_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = ads_duo_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = ads_duo_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = ads_duo_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_TEVION_DVBT_220RF:
                 dev->dvb.frontend = tda10046_attach(&tevion_dvbt220rf_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.sleep = tevion_dvb220rf_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = tevion_dvb220rf_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = tevion_dvb220rf_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = tevion_dvb220rf_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS:
                 dev->dvb.frontend = tda10046_attach(&ads_tech_duo_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops->tuner_ops.init = ads_duo_tuner_init;
-                        dev->dvb.frontend->ops->tuner_ops.sleep = ads_duo_tuner_sleep;
-                        dev->dvb.frontend->ops->tuner_ops.set_params = ads_duo_tuner_set_params;
+                        dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init;
+                        dev->dvb.frontend->ops.tuner_ops.sleep = ads_duo_tuner_sleep;
+                        dev->dvb.frontend->ops.tuner_ops.set_params = ads_duo_tuner_set_params;
                 }
                 break;
 #endif