system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-23 03:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] bttv: rename field 'audio' in struct 'bttv' to 'audio_input'

Browse source 
'audio_input' better describes the meaning of this field.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Frank Schaefer 2013-03-21 13:51:16 -03:00 committed by Mauro Carvalho Chehab
parent 20167f17f1
commit 2166f0a971
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/pci/bt8xx/bttv-cards.c
View file

@ -3947,7 +3947,7 @@ static void avermedia_eeprom(struct bttv *btv)
u32 bttv_tda9880_setnorm(struct bttv *btv, u32 gpiobits) u32 bttv_tda9880_setnorm(struct bttv *btv, u32 gpiobits)
{ {
if (btv->audio == TVAUDIO_INPUT_TUNER) { if (btv->audio_input == TVAUDIO_INPUT_TUNER) {
if (bttv_tvnorms[btv->tvnorm].v4l2_id & V4L2_STD_MN) if (bttv_tvnorms[btv->tvnorm].v4l2_id & V4L2_STD_MN)
gpiobits |= 0x10000; gpiobits |= 0x10000;
else else

12
drivers/media/pci/bt8xx/bttv-driver.c
View file

@ -1093,7 +1093,7 @@ audio_mux(struct bttv *btv, int input, int mute)
static inline int static inline int
audio_mute(struct bttv *btv, int mute) audio_mute(struct bttv *btv, int mute)
{ {
return audio_mux(btv, btv->audio, mute); return audio_mux(btv, btv->audio_input, mute);
} }
static inline int static inline int
@ -1195,9 +1195,9 @@ set_input(struct bttv *btv, unsigned int input, unsigned int norm)
} else { } else {
video_mux(btv,input); video_mux(btv,input);
} }
btv->audio = (btv->tuner_type != TUNER_ABSENT && input == 0) ? btv->audio_input = (btv->tuner_type != TUNER_ABSENT && input == 0) ?
TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN; TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN;
audio_input(btv, btv->audio); audio_input(btv, btv->audio_input);
set_tvnorm(btv, norm); set_tvnorm(btv, norm);
} }
@ -1706,8 +1706,8 @@ static void radio_enable(struct bttv *btv)
if (!btv->has_radio_tuner) { if (!btv->has_radio_tuner) {
btv->has_radio_tuner = 1; btv->has_radio_tuner = 1;
bttv_call_all(btv, tuner, s_radio); bttv_call_all(btv, tuner, s_radio);
btv->audio = TVAUDIO_INPUT_RADIO; btv->audio_input = TVAUDIO_INPUT_RADIO;
audio_input(btv, btv->audio); audio_input(btv, btv->audio_input);
} }
} }

2
drivers/media/pci/bt8xx/bttvp.h
View file

@ -423,7 +423,7 @@ struct bttv {
/* video state */ /* video state */
unsigned int input; unsigned int input;
unsigned int audio; unsigned int audio_input;
unsigned int mute; unsigned int mute;
unsigned long tv_freq; unsigned long tv_freq;
unsigned int tvnorm; unsigned int tvnorm;