Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2166f0a9 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

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



'audio_input' better describes the meaning of this field.

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 20167f17

drivers/media/pci/bt8xx/bttv-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -3947,7 +3947,7 @@ static void avermedia_eeprom(struct bttv *btv) 
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)

			gpiobits |= 0x10000;

		else

drivers/media/pci/bt8xx/bttv-driver.c

+6 −6
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ audio_mux(struct bttv *btv, int input, int mute) 
static inline int

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
@@ -1195,9 +1195,9 @@ set_input(struct bttv *btv, unsigned int input, unsigned int norm) 
	} else {

		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;

	audio_input(btv, btv->audio);

	audio_input(btv, btv->audio_input);

	set_tvnorm(btv, norm);

}
@@ -1706,8 +1706,8 @@ static void radio_enable(struct bttv *btv) 
	if (!btv->has_radio_tuner) {

		btv->has_radio_tuner = 1;

		bttv_call_all(btv, tuner, s_radio);

		btv->audio = TVAUDIO_INPUT_RADIO;

		audio_input(btv, btv->audio);

		btv->audio_input = TVAUDIO_INPUT_RADIO;

		audio_input(btv, btv->audio_input);

	}

}

drivers/media/pci/bt8xx/bttvp.h

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ struct bttv { 


	/* video state */

	unsigned int input;

	unsigned int audio;

	unsigned int audio_input;

	unsigned int mute;

	unsigned long tv_freq;

	unsigned int tvnorm;