diff mbox

[RFC,04/10] bttv: rename field 'audio' in struct 'bttv' to 'audio_input'

Message ID 1363807490-3906-5-git-send-email-fschaefer.oss@googlemail.com (mailing list archive)
State RFC, archived
Headers

Commit Message

Frank Schaefer March 20, 2013, 7:24 p.m. UTC 
  'audio_input' better describes the meaning of this field.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
---
 drivers/media/pci/bt8xx/bttv-cards.c  |    2 +-
 drivers/media/pci/bt8xx/bttv-driver.c |   12 ++++++------
 drivers/media/pci/bt8xx/bttvp.h       |    2 +-
 3 Dateien geändert, 8 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)

Comments

Hans Verkuil March 21, 2013, 10:28 a.m. UTC | #1 
On Wed 20 March 2013 20:24:44 Frank Schäfer wrote:
> 'audio_input' better describes the meaning of this field.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>

Regards,

	Hans

> Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
> ---
>  drivers/media/pci/bt8xx/bttv-cards.c  |    2 +-
>  drivers/media/pci/bt8xx/bttv-driver.c |   12 ++++++------
>  drivers/media/pci/bt8xx/bttvp.h       |    2 +-
>  3 Dateien geändert, 8 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)
> 
> diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
> index fa0faaa..b7dc921 100644
> --- a/drivers/media/pci/bt8xx/bttv-cards.c
> +++ b/drivers/media/pci/bt8xx/bttv-cards.c
> @@ -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
> diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
> index e01a8d8..81ee70d 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)
>  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) ?
> -			 TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN;
> -	audio_input(btv, btv->audio);
> +	btv->audio_input = (btv->tuner_type != TUNER_ABSENT && input == 0) ?
> +				TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN;
> +	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);
>  	}
>  }
>  
> diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h
> index e7910e0..9c1cc2c 100644
> --- a/drivers/media/pci/bt8xx/bttvp.h
> +++ b/drivers/media/pci/bt8xx/bttvp.h
> @@ -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;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index fa0faaa..b7dc921 100644
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
@@ -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
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index e01a8d8..81ee70d 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)
 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) ?
-			 TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN;
-	audio_input(btv, btv->audio);
+	btv->audio_input = (btv->tuner_type != TUNER_ABSENT && input == 0) ?
+				TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN;
+	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);
 	}
 }
 
diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h
index e7910e0..9c1cc2c 100644
--- a/drivers/media/pci/bt8xx/bttvp.h
+++ b/drivers/media/pci/bt8xx/bttvp.h
@@ -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;