Skip to content

L
linux
Commit c39ba330 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files
Options

[media] cx88: consistently use UNSET for absent tuner 

Don't mix UNSET and TUNER_ABSENT: you have to pick one or the other. For
this driver selecting UNSET to represent an absent tuner resulting in
the fewest changes.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 078859a3
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 34 deletions
drivers/media/pci/cx88/cx88-cards.c
View file @ c39ba330
...@@ -347,7 +347,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -347,7 +347,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_IODATA_GVVCP3PCI] = { [CX88_BOARD_IODATA_GVVCP3PCI] = {
.name = "IODATA GV-VCP3/PCI", .name = "IODATA GV-VCP3/PCI",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -436,7 +436,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -436,7 +436,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_KWORLD_DVB_T] = { [CX88_BOARD_KWORLD_DVB_T] = {
.name = "KWorld/VStream XPert DVB-T", .name = "KWorld/VStream XPert DVB-T",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -455,7 +455,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -455,7 +455,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1] = { [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1] = {
.name = "DViCO FusionHDTV DVB-T1", .name = "DViCO FusionHDTV DVB-T1",
.tuner_type = TUNER_ABSENT, /* No analog tuner */ .tuner_type = UNSET, /* No analog tuner */
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -542,7 +542,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -542,7 +542,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_HAUPPAUGE_DVB_T1] = { [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
.name = "Hauppauge Nova-T DVB-T", .name = "Hauppauge Nova-T DVB-T",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -554,7 +554,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -554,7 +554,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_CONEXANT_DVB_T1] = { [CX88_BOARD_CONEXANT_DVB_T1] = {
.name = "Conexant DVB-T reference design", .name = "Conexant DVB-T reference design",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -579,7 +579,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -579,7 +579,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS] = { [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS] = {
.name = "DViCO FusionHDTV DVB-T Plus", .name = "DViCO FusionHDTV DVB-T Plus",
.tuner_type = TUNER_ABSENT, /* No analog tuner */ .tuner_type = UNSET, /* No analog tuner */
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -596,7 +596,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -596,7 +596,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_DNTV_LIVE_DVB_T] = { [CX88_BOARD_DNTV_LIVE_DVB_T] = {
.name = "digitalnow DNTV Live! DVB-T", .name = "digitalnow DNTV Live! DVB-T",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -787,7 +787,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -787,7 +787,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_ADSTECH_DVB_T_PCI] = { [CX88_BOARD_ADSTECH_DVB_T_PCI] = {
.name = "ADS Tech Instant TV DVB-T PCI", .name = "ADS Tech Instant TV DVB-T PCI",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -806,7 +806,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -806,7 +806,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1] = { [CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1] = {
.name = "TerraTec Cinergy 1400 DVB-T", .name = "TerraTec Cinergy 1400 DVB-T",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.input = { { .input = { {
.type = CX88_VMUX_DVB, .type = CX88_VMUX_DVB,
.vmux = 0, .vmux = 0,
...@@ -924,7 +924,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -924,7 +924,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_WINFAST_DTV1000] = { [CX88_BOARD_WINFAST_DTV1000] = {
.name = "WinFast DTV1000-T", .name = "WinFast DTV1000-T",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -972,7 +972,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -972,7 +972,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1] = { [CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1] = {
.name = "Hauppauge Nova-S-Plus DVB-S", .name = "Hauppauge Nova-S-Plus DVB-S",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -998,7 +998,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -998,7 +998,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_HAUPPAUGE_NOVASE2_S1] = { [CX88_BOARD_HAUPPAUGE_NOVASE2_S1] = {
.name = "Hauppauge Nova-SE2 DVB-S", .name = "Hauppauge Nova-SE2 DVB-S",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -1010,7 +1010,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1010,7 +1010,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_KWORLD_DVBS_100] = { [CX88_BOARD_KWORLD_DVBS_100] = {
.name = "KWorld DVB-S 100", .name = "KWorld DVB-S 100",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -1102,7 +1102,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1102,7 +1102,7 @@ static const struct cx88_board cx88_boards[] = {
/* DTT 7579 Conexant CX22702-19 Conexant CX2388x */ /* DTT 7579 Conexant CX22702-19 Conexant CX2388x */
/* Manenti Marco <marco_manenti@colman.it> */ /* Manenti Marco <marco_manenti@colman.it> */
.name = "KWorld/VStream XPert DVB-T with cx22702", .name = "KWorld/VStream XPert DVB-T with cx22702",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -1121,7 +1121,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1121,7 +1121,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL] = { [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL] = {
.name = "DViCO FusionHDTV DVB-T Dual Digital", .name = "DViCO FusionHDTV DVB-T Dual Digital",
.tuner_type = TUNER_ABSENT, /* No analog tuner */ .tuner_type = UNSET, /* No analog tuner */
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -1356,7 +1356,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1356,7 +1356,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_GENIATECH_DVBS] = { [CX88_BOARD_GENIATECH_DVBS] = {
.name = "Geniatech DVB-S", .name = "Geniatech DVB-S",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -1494,7 +1494,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1494,7 +1494,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_SAMSUNG_SMT_7020] = { [CX88_BOARD_SAMSUNG_SMT_7020] = {
.name = "Samsung SMT 7020 DVB-S", .name = "Samsung SMT 7020 DVB-S",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -1506,7 +1506,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1506,7 +1506,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_ADSTECH_PTV_390] = { [CX88_BOARD_ADSTECH_PTV_390] = {
.name = "ADS Tech Instant Video PCI", .name = "ADS Tech Instant Video PCI",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -1553,7 +1553,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1553,7 +1553,7 @@ static const struct cx88_board cx88_boards[] = {
[CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO] = { [CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO] = {
.name = "DViCO FusionHDTV 5 PCI nano", .name = "DViCO FusionHDTV 5 PCI nano",
/* xc3008 tuner, digital only for now */ /* xc3008 tuner, digital only for now */
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -2069,7 +2069,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -2069,7 +2069,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_TBS_8920] = { [CX88_BOARD_TBS_8920] = {
.name = "TBS 8920 DVB-S/S2", .name = "TBS 8920 DVB-S/S2",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -2304,7 +2304,7 @@ static const struct cx88_board cx88_boards[] = { ...@@ -2304,7 +2304,7 @@ static const struct cx88_board cx88_boards[] = {
}, },
[CX88_BOARD_TWINHAN_VP1027_DVBS] = { [CX88_BOARD_TWINHAN_VP1027_DVBS] = {
.name = "Twinhan VP-1027 DVB-S", .name = "Twinhan VP-1027 DVB-S",
.tuner_type = TUNER_ABSENT, .tuner_type = UNSET,
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
...@@ -2921,33 +2921,33 @@ static const struct { ...@@ -2921,33 +2921,33 @@ static const struct {
int fm; int fm;
const char *name; const char *name;
} gdi_tuner[] = { } gdi_tuner[] = {
[ 0x01 ] = { .id = TUNER_ABSENT, [ 0x01 ] = { .id = UNSET,
.name = "NTSC_M" }, .name = "NTSC_M" },
[ 0x02 ] = { .id = TUNER_ABSENT, [ 0x02 ] = { .id = UNSET,
.name = "PAL_B" }, .name = "PAL_B" },
[ 0x03 ] = { .id = TUNER_ABSENT, [ 0x03 ] = { .id = UNSET,
.name = "PAL_I" }, .name = "PAL_I" },
[ 0x04 ] = { .id = TUNER_ABSENT, [ 0x04 ] = { .id = UNSET,
.name = "PAL_D" }, .name = "PAL_D" },
[ 0x05 ] = { .id = TUNER_ABSENT, [ 0x05 ] = { .id = UNSET,
.name = "SECAM" }, .name = "SECAM" },
[ 0x10 ] = { .id = TUNER_ABSENT, [ 0x10 ] = { .id = UNSET,
.fm = 1, .fm = 1,
.name = "TEMIC_4049" }, .name = "TEMIC_4049" },
[ 0x11 ] = { .id = TUNER_TEMIC_4136FY5, [ 0x11 ] = { .id = TUNER_TEMIC_4136FY5,
.name = "TEMIC_4136" }, .name = "TEMIC_4136" },
[ 0x12 ] = { .id = TUNER_ABSENT, [ 0x12 ] = { .id = UNSET,
.name = "TEMIC_4146" }, .name = "TEMIC_4146" },
[ 0x20 ] = { .id = TUNER_PHILIPS_FQ1216ME, [ 0x20 ] = { .id = TUNER_PHILIPS_FQ1216ME,
.fm = 1, .fm = 1,
.name = "PHILIPS_FQ1216_MK3" }, .name = "PHILIPS_FQ1216_MK3" },
[ 0x21 ] = { .id = TUNER_ABSENT, .fm = 1, [ 0x21 ] = { .id = UNSET, .fm = 1,
.name = "PHILIPS_FQ1236_MK3" }, .name = "PHILIPS_FQ1236_MK3" },
[ 0x22 ] = { .id = TUNER_ABSENT, [ 0x22 ] = { .id = UNSET,
.name = "PHILIPS_FI1236_MK3" }, .name = "PHILIPS_FI1236_MK3" },
[ 0x23 ] = { .id = TUNER_ABSENT, [ 0x23 ] = { .id = UNSET,
.name = "PHILIPS_FI1216_MK3" }, .name = "PHILIPS_FI1216_MK3" },
}; };
...@@ -3564,7 +3564,7 @@ static void cx88_card_setup(struct cx88_core *core) ...@@ -3564,7 +3564,7 @@ static void cx88_card_setup(struct cx88_core *core)
mode_mask &= ~T_RADIO; mode_mask &= ~T_RADIO;
} }
if (core->board.tuner_type != TUNER_ABSENT) { if (core->board.tuner_type != UNSET) {
tun_setup.mode_mask = mode_mask; tun_setup.mode_mask = mode_mask;
tun_setup.type = core->board.tuner_type; tun_setup.type = core->board.tuner_type;
tun_setup.addr = core->board.tuner_addr; tun_setup.addr = core->board.tuner_addr;
...@@ -3777,7 +3777,7 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr) ...@@ -3777,7 +3777,7 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
cx88_i2c_init(core, pci); cx88_i2c_init(core, pci);
/* load tuner module, if needed */ /* load tuner module, if needed */
if (TUNER_ABSENT != core->board.tuner_type) { if (UNSET != core->board.tuner_type) {
/* Ignore 0x6b and 0x6f on cx88 boards. /* Ignore 0x6b and 0x6f on cx88 boards.
* FusionHDTV5 RT Gold has an ir receiver at 0x6b * FusionHDTV5 RT Gold has an ir receiver at 0x6b
* and an RTC at 0x6f which can get corrupted if probed. */ * and an RTC at 0x6f which can get corrupted if probed. */
......
drivers/media/pci/cx88/cx88-video.c
View file @ c39ba330
...@@ -1532,7 +1532,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, ...@@ -1532,7 +1532,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
} }
/* start tvaudio thread */ /* start tvaudio thread */
if (core->board.tuner_type != TUNER_ABSENT) { if (core->board.tuner_type != UNSET) {
core->kthread = kthread_run(cx88_audio_thread, core, "cx88 tvaudio"); core->kthread = kthread_run(cx88_audio_thread, core, "cx88 tvaudio");
if (IS_ERR(core->kthread)) { if (IS_ERR(core->kthread)) {
err = PTR_ERR(core->kthread); err = PTR_ERR(core->kthread);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7