diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-dvb.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index c253e20087ce..1773b40467dc 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -386,7 +386,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
386 | if (dev->dvb.frontend != NULL) { | 386 | if (dev->dvb.frontend != NULL) { |
387 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 387 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
388 | &dev->core->i2c_adap, | 388 | &dev->core->i2c_adap, |
389 | &dvb_pll_thomson_dtt759x); | 389 | DVB_PLL_THOMSON_DTT759X); |
390 | } | 390 | } |
391 | break; | 391 | break; |
392 | case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: | 392 | case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: |
@@ -399,7 +399,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
399 | if (dev->dvb.frontend != NULL) { | 399 | if (dev->dvb.frontend != NULL) { |
400 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, | 400 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, |
401 | &dev->core->i2c_adap, | 401 | &dev->core->i2c_adap, |
402 | &dvb_pll_thomson_dtt7579); | 402 | DVB_PLL_THOMSON_DTT7579); |
403 | } | 403 | } |
404 | break; | 404 | break; |
405 | case CX88_BOARD_WINFAST_DTV2000H: | 405 | case CX88_BOARD_WINFAST_DTV2000H: |
@@ -412,7 +412,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
412 | &dev->core->i2c_adap); | 412 | &dev->core->i2c_adap); |
413 | if (dev->dvb.frontend != NULL) { | 413 | if (dev->dvb.frontend != NULL) { |
414 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 414 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
415 | &dev->core->i2c_adap, &dvb_pll_fmd1216me); | 415 | &dev->core->i2c_adap, DVB_PLL_FMD1216ME); |
416 | } | 416 | } |
417 | break; | 417 | break; |
418 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS: | 418 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS: |
@@ -421,7 +421,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
421 | &dev->core->i2c_adap); | 421 | &dev->core->i2c_adap); |
422 | if (dev->dvb.frontend != NULL) { | 422 | if (dev->dvb.frontend != NULL) { |
423 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, | 423 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, |
424 | NULL, &dvb_pll_thomson_dtt7579); | 424 | NULL, DVB_PLL_THOMSON_DTT7579); |
425 | break; | 425 | break; |
426 | } | 426 | } |
427 | /* ZL10353 replaces MT352 on later cards */ | 427 | /* ZL10353 replaces MT352 on later cards */ |
@@ -430,7 +430,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
430 | &dev->core->i2c_adap); | 430 | &dev->core->i2c_adap); |
431 | if (dev->dvb.frontend != NULL) { | 431 | if (dev->dvb.frontend != NULL) { |
432 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, | 432 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, |
433 | NULL, &dvb_pll_thomson_dtt7579); | 433 | NULL, DVB_PLL_THOMSON_DTT7579); |
434 | } | 434 | } |
435 | break; | 435 | break; |
436 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL: | 436 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL: |
@@ -441,7 +441,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
441 | &dev->core->i2c_adap); | 441 | &dev->core->i2c_adap); |
442 | if (dev->dvb.frontend != NULL) { | 442 | if (dev->dvb.frontend != NULL) { |
443 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 443 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
444 | NULL, &dvb_pll_thomson_dtt7579); | 444 | NULL, DVB_PLL_THOMSON_DTT7579); |
445 | break; | 445 | break; |
446 | } | 446 | } |
447 | /* ZL10353 replaces MT352 on later cards */ | 447 | /* ZL10353 replaces MT352 on later cards */ |
@@ -450,7 +450,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
450 | &dev->core->i2c_adap); | 450 | &dev->core->i2c_adap); |
451 | if (dev->dvb.frontend != NULL) { | 451 | if (dev->dvb.frontend != NULL) { |
452 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 452 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
453 | NULL, &dvb_pll_thomson_dtt7579); | 453 | NULL, DVB_PLL_THOMSON_DTT7579); |
454 | } | 454 | } |
455 | break; | 455 | break; |
456 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: | 456 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: |
@@ -459,7 +459,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
459 | &dev->core->i2c_adap); | 459 | &dev->core->i2c_adap); |
460 | if (dev->dvb.frontend != NULL) { | 460 | if (dev->dvb.frontend != NULL) { |
461 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 461 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
462 | NULL, &dvb_pll_lg_z201); | 462 | NULL, DVB_PLL_LG_Z201); |
463 | } | 463 | } |
464 | break; | 464 | break; |
465 | case CX88_BOARD_KWORLD_DVB_T: | 465 | case CX88_BOARD_KWORLD_DVB_T: |
@@ -470,7 +470,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
470 | &dev->core->i2c_adap); | 470 | &dev->core->i2c_adap); |
471 | if (dev->dvb.frontend != NULL) { | 471 | if (dev->dvb.frontend != NULL) { |
472 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 472 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
473 | NULL, &dvb_pll_unknown_1); | 473 | NULL, DVB_PLL_UNKNOWN_1); |
474 | } | 474 | } |
475 | break; | 475 | break; |
476 | case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: | 476 | case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: |
@@ -479,7 +479,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
479 | &((struct vp3054_i2c_state *)dev->card_priv)->adap); | 479 | &((struct vp3054_i2c_state *)dev->card_priv)->adap); |
480 | if (dev->dvb.frontend != NULL) { | 480 | if (dev->dvb.frontend != NULL) { |
481 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 481 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
482 | &dev->core->i2c_adap, &dvb_pll_fmd1216me); | 482 | &dev->core->i2c_adap, DVB_PLL_FMD1216ME); |
483 | } | 483 | } |
484 | #else | 484 | #else |
485 | printk("%s: built without vp3054 support\n", dev->core->name); | 485 | printk("%s: built without vp3054 support\n", dev->core->name); |
@@ -492,7 +492,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
492 | if (dev->dvb.frontend != NULL) { | 492 | if (dev->dvb.frontend != NULL) { |
493 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 493 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
494 | &dev->core->i2c_adap, | 494 | &dev->core->i2c_adap, |
495 | &dvb_pll_thomson_fe6600); | 495 | DVB_PLL_THOMSON_FE6600); |
496 | } | 496 | } |
497 | break; | 497 | break; |
498 | case CX88_BOARD_PCHDTV_HD3000: | 498 | case CX88_BOARD_PCHDTV_HD3000: |
@@ -501,7 +501,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
501 | if (dev->dvb.frontend != NULL) { | 501 | if (dev->dvb.frontend != NULL) { |
502 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 502 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
503 | &dev->core->i2c_adap, | 503 | &dev->core->i2c_adap, |
504 | &dvb_pll_thomson_dtt761x); | 504 | DVB_PLL_THOMSON_DTT761X); |
505 | } | 505 | } |
506 | break; | 506 | break; |
507 | case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q: | 507 | case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q: |
@@ -523,7 +523,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
523 | if (dev->dvb.frontend != NULL) { | 523 | if (dev->dvb.frontend != NULL) { |
524 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 524 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
525 | &dev->core->i2c_adap, | 525 | &dev->core->i2c_adap, |
526 | &dvb_pll_microtune_4042); | 526 | DVB_PLL_MICROTUNE_4042); |
527 | } | 527 | } |
528 | } | 528 | } |
529 | break; | 529 | break; |
@@ -543,7 +543,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
543 | if (dev->dvb.frontend != NULL) { | 543 | if (dev->dvb.frontend != NULL) { |
544 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 544 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
545 | &dev->core->i2c_adap, | 545 | &dev->core->i2c_adap, |
546 | &dvb_pll_thomson_dtt761x); | 546 | DVB_PLL_THOMSON_DTT761X); |
547 | } | 547 | } |
548 | } | 548 | } |
549 | break; | 549 | break; |
@@ -563,7 +563,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
563 | if (dev->dvb.frontend != NULL) { | 563 | if (dev->dvb.frontend != NULL) { |
564 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 564 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
565 | &dev->core->i2c_adap, | 565 | &dev->core->i2c_adap, |
566 | &dvb_pll_lg_tdvs_h06xf); | 566 | DVB_PLL_LG_TDVS_H06XF); |
567 | } | 567 | } |
568 | } | 568 | } |
569 | break; | 569 | break; |
@@ -583,7 +583,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
583 | if (dev->dvb.frontend != NULL) { | 583 | if (dev->dvb.frontend != NULL) { |
584 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 584 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
585 | &dev->core->i2c_adap, | 585 | &dev->core->i2c_adap, |
586 | &dvb_pll_lg_tdvs_h06xf); | 586 | DVB_PLL_LG_TDVS_H06XF); |
587 | } | 587 | } |
588 | } | 588 | } |
589 | break; | 589 | break; |
@@ -593,7 +593,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
593 | &dev->core->i2c_adap); | 593 | &dev->core->i2c_adap); |
594 | if (dev->dvb.frontend != NULL) { | 594 | if (dev->dvb.frontend != NULL) { |
595 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 595 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
596 | NULL, &dvb_pll_tuv1236d); | 596 | NULL, DVB_PLL_TUV1236D); |
597 | } | 597 | } |
598 | break; | 598 | break; |
599 | case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: | 599 | case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: |