aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/bt8xx/bttv-driver.c
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2013-03-21 12:51:16 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-23 10:31:13 -0400
commit2166f0a9710413ea60bd72a4983de11b764468e4 (patch)
tree919651b68c2678c145b482502ae91f73550172cd /drivers/media/pci/bt8xx/bttv-driver.c
parent20167f17f19a5d842f74c3375468f68bf039eaa5 (diff)
[media] bttv: rename field 'audio' in struct 'bttv' to 'audio_input'
'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>
Diffstat (limited to 'drivers/media/pci/bt8xx/bttv-driver.c')
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index e01a8d8c9fd0..81ee70d93189 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1093,7 +1093,7 @@ audio_mux(struct bttv *btv, int input, int mute)
1093static inline int 1093static inline int
1094audio_mute(struct bttv *btv, int mute) 1094audio_mute(struct bttv *btv, int mute)
1095{ 1095{
1096 return audio_mux(btv, btv->audio, mute); 1096 return audio_mux(btv, btv->audio_input, mute);
1097} 1097}
1098 1098
1099static inline int 1099static inline int
@@ -1195,9 +1195,9 @@ set_input(struct bttv *btv, unsigned int input, unsigned int norm)
1195 } else { 1195 } else {
1196 video_mux(btv,input); 1196 video_mux(btv,input);
1197 } 1197 }
1198 btv->audio = (btv->tuner_type != TUNER_ABSENT && input == 0) ? 1198 btv->audio_input = (btv->tuner_type != TUNER_ABSENT && input == 0) ?
1199 TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN; 1199 TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN;
1200 audio_input(btv, btv->audio); 1200 audio_input(btv, btv->audio_input);
1201 set_tvnorm(btv, norm); 1201 set_tvnorm(btv, norm);
1202} 1202}
1203 1203
@@ -1706,8 +1706,8 @@ static void radio_enable(struct bttv *btv)
1706 if (!btv->has_radio_tuner) { 1706 if (!btv->has_radio_tuner) {
1707 btv->has_radio_tuner = 1; 1707 btv->has_radio_tuner = 1;
1708 bttv_call_all(btv, tuner, s_radio); 1708 bttv_call_all(btv, tuner, s_radio);
1709 btv->audio = TVAUDIO_INPUT_RADIO; 1709 btv->audio_input = TVAUDIO_INPUT_RADIO;
1710 audio_input(btv, btv->audio); 1710 audio_input(btv, btv->audio_input);
1711 } 1711 }
1712} 1712}
1713 1713