From: "Frank Schäfer" <fschaefer.oss@googlemail.com>
To: mchehab@redhat.com
Cc: hverkuil@xs4all.nl, linux-media@vger.kernel.org,
"Frank Schäfer" <fschaefer.oss@googlemail.com>
Subject: [RFC PATCH 04/10] bttv: rename field 'audio' in struct 'bttv' to 'audio_input'
Date: Wed, 20 Mar 2013 20:24:44 +0100 [thread overview]
Message-ID: <1363807490-3906-5-git-send-email-fschaefer.oss@googlemail.com> (raw)
In-Reply-To: <1363807490-3906-1-git-send-email-fschaefer.oss@googlemail.com>
'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(-)
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;
--
1.7.10.4
next prev parent reply other threads:[~2013-03-20 19:24 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 19:24 [RFC PATCH 00/10] bttv: refactor audio_mux() and fix muting/unmuting Frank Schäfer
2013-03-20 19:24 ` [RFC PATCH 01/10] bttv: audio_mux(): use a local variable "gpio_mute" instead of modifying the function parameter "mute" Frank Schäfer
2013-03-21 10:24 ` Hans Verkuil
2013-03-20 19:24 ` [RFC PATCH 02/10] bttv: audio_mux(): do not change the value of the v4l2 mute control Frank Schäfer
2013-03-21 10:26 ` Hans Verkuil
2013-03-20 19:24 ` [RFC PATCH 03/10] bttv: do not save the audio input in audio_mux() Frank Schäfer
2013-03-21 10:28 ` Hans Verkuil
2013-03-20 19:24 ` Frank Schäfer [this message]
2013-03-21 10:28 ` [RFC PATCH 04/10] bttv: rename field 'audio' in struct 'bttv' to 'audio_input' Hans Verkuil
2013-03-20 19:24 ` [RFC PATCH 05/10] bttv: separate GPIO part from function audio_mux() Frank Schäfer
2013-03-21 10:32 ` Hans Verkuil
2013-03-20 19:24 ` [RFC PATCH 06/10] bttv: untangle audio input and mute setting Frank Schäfer
2013-03-21 10:37 ` Hans Verkuil
2013-03-20 19:24 ` [RFC PATCH 07/10] bttv: do not unmute the device before the first open Frank Schäfer
2013-03-21 10:38 ` Hans Verkuil
2013-03-20 19:24 ` [RFC PATCH 08/10] bttv: apply mute settings on open Frank Schäfer
2013-03-21 10:39 ` Hans Verkuil
2013-03-20 19:24 ` [RFC PATCH 09/10] bttv: fix mute on last close of the video device node Frank Schäfer
2013-03-21 10:56 ` Hans Verkuil
2013-03-21 17:44 ` Frank Schäfer
2013-03-20 19:24 ` [RFC PATCH 10/10] bttv: avoid mute on last close when the radio device node is still open Frank Schäfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363807490-3906-5-git-send-email-fschaefer.oss@googlemail.com \
--to=fschaefer.oss@googlemail.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.