diff options
Diffstat (limited to 'drivers/media/dvb/ttpci/budget-patch.c')
-rw-r--r-- | drivers/media/dvb/ttpci/budget-patch.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index 3515f524176a..ee60ce90a400 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 | |||
281 | // NOTE: since we're using a prescaler of 2, we set the | 281 | // NOTE: since we're using a prescaler of 2, we set the |
282 | // divisor frequency to 62.5kHz and divide by 125 above | 282 | // divisor frequency to 62.5kHz and divide by 125 above |
283 | 283 | ||
284 | if (fe->ops->i2c_gate_ctrl) | 284 | if (fe->ops.i2c_gate_ctrl) |
285 | fe->ops->i2c_gate_ctrl(fe, 1); | 285 | fe->ops.i2c_gate_ctrl(fe, 1); |
286 | if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) | 286 | if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) |
287 | return -EIO; | 287 | return -EIO; |
288 | return 0; | 288 | return 0; |
@@ -307,8 +307,8 @@ static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dv | |||
307 | data[2] = 0x8e; | 307 | data[2] = 0x8e; |
308 | data[3] = 0x00; | 308 | data[3] = 0x00; |
309 | 309 | ||
310 | if (fe->ops->i2c_gate_ctrl) | 310 | if (fe->ops.i2c_gate_ctrl) |
311 | fe->ops->i2c_gate_ctrl(fe, 1); | 311 | fe->ops.i2c_gate_ctrl(fe, 1); |
312 | if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) | 312 | if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) |
313 | return -EIO; | 313 | return -EIO; |
314 | return 0; | 314 | return 0; |
@@ -327,32 +327,32 @@ static void frontend_init(struct budget_patch* budget) | |||
327 | // try the ALPS BSRV2 first of all | 327 | // try the ALPS BSRV2 first of all |
328 | budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap); | 328 | budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap); |
329 | if (budget->dvb_frontend) { | 329 | if (budget->dvb_frontend) { |
330 | budget->dvb_frontend->ops->tuner_ops.set_params = alps_bsrv2_tuner_set_params; | 330 | budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params; |
331 | budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd; | 331 | budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd; |
332 | budget->dvb_frontend->ops->diseqc_send_burst = budget_patch_diseqc_send_burst; | 332 | budget->dvb_frontend->ops.diseqc_send_burst = budget_patch_diseqc_send_burst; |
333 | budget->dvb_frontend->ops->set_tone = budget_patch_set_tone; | 333 | budget->dvb_frontend->ops.set_tone = budget_patch_set_tone; |
334 | break; | 334 | break; |
335 | } | 335 | } |
336 | 336 | ||
337 | // try the ALPS BSRU6 now | 337 | // try the ALPS BSRU6 now |
338 | budget->dvb_frontend = stv0299_attach(&alps_bsru6_config, &budget->i2c_adap); | 338 | budget->dvb_frontend = stv0299_attach(&alps_bsru6_config, &budget->i2c_adap); |
339 | if (budget->dvb_frontend) { | 339 | if (budget->dvb_frontend) { |
340 | budget->dvb_frontend->ops->tuner_ops.set_params = alps_bsru6_tuner_set_params; | 340 | budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params; |
341 | budget->dvb_frontend->tuner_priv = &budget->i2c_adap; | 341 | budget->dvb_frontend->tuner_priv = &budget->i2c_adap; |
342 | 342 | ||
343 | budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd; | 343 | budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd; |
344 | budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst; | 344 | budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst; |
345 | budget->dvb_frontend->ops->set_tone = budget_set_tone; | 345 | budget->dvb_frontend->ops.set_tone = budget_set_tone; |
346 | break; | 346 | break; |
347 | } | 347 | } |
348 | 348 | ||
349 | // Try the grundig 29504-451 | 349 | // Try the grundig 29504-451 |
350 | budget->dvb_frontend = tda8083_attach(&grundig_29504_451_config, &budget->i2c_adap); | 350 | budget->dvb_frontend = tda8083_attach(&grundig_29504_451_config, &budget->i2c_adap); |
351 | if (budget->dvb_frontend) { | 351 | if (budget->dvb_frontend) { |
352 | budget->dvb_frontend->ops->tuner_ops.set_params = grundig_29504_451_tuner_set_params; | 352 | budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params; |
353 | budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd; | 353 | budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd; |
354 | budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst; | 354 | budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst; |
355 | budget->dvb_frontend->ops->set_tone = budget_set_tone; | 355 | budget->dvb_frontend->ops.set_tone = budget_set_tone; |
356 | break; | 356 | break; |
357 | } | 357 | } |
358 | break; | 358 | break; |
@@ -367,8 +367,8 @@ static void frontend_init(struct budget_patch* budget) | |||
367 | } else { | 367 | } else { |
368 | if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) { | 368 | if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) { |
369 | printk("budget-av: Frontend registration failed!\n"); | 369 | printk("budget-av: Frontend registration failed!\n"); |
370 | if (budget->dvb_frontend->ops->release) | 370 | if (budget->dvb_frontend->ops.release) |
371 | budget->dvb_frontend->ops->release(budget->dvb_frontend); | 371 | budget->dvb_frontend->ops.release(budget->dvb_frontend); |
372 | budget->dvb_frontend = NULL; | 372 | budget->dvb_frontend = NULL; |
373 | } | 373 | } |
374 | } | 374 | } |