iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] bttv: separate GPIO part from function audio_mux()

Browse Source 
Move the GPIO part of function audio_mux() to a separate function
audio_mux_gpio().
This prepares the code for the next patch which will separate mute and input
setting.

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:17 -03:00 committed by Mauro Carvalho Chehab
parent 2166f0a971
commit 5f45678173
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/pci/bt8xx/bttv-driver.c
View File

@ -989,11 +989,10 @@ static char *audio_modes[] = {
"audio: intern", "audio: mute" "audio: intern", "audio: mute"
}; };
static int static void
audio_mux(struct bttv *btv, int input, int mute) audio_mux_gpio(struct bttv *btv, int input, int mute)
{ {
int gpio_val, signal, mute_gpio; int gpio_val, signal, mute_gpio;
struct v4l2_ctrl *ctrl;
gpio_inout(bttv_tvcards[btv->c.type].gpiomask, gpio_inout(bttv_tvcards[btv->c.type].gpiomask,
bttv_tvcards[btv->c.type].gpiomask); bttv_tvcards[btv->c.type].gpiomask);
@ -1020,8 +1019,14 @@ audio_mux(struct bttv *btv, int input, int mute)
if (bttv_gpio) if (bttv_gpio)
bttv_gpio_tracking(btv, audio_modes[mute_gpio ? 4 : input]); bttv_gpio_tracking(btv, audio_modes[mute_gpio ? 4 : input]);
if (in_interrupt()) }
return 0;
static int
audio_mux(struct bttv *btv, int input, int mute)
{
struct v4l2_ctrl *ctrl;
audio_mux_gpio(btv, input, mute);
if (btv->sd_msp34xx) { if (btv->sd_msp34xx) {
u32 in; u32 in;
@ -3846,7 +3851,8 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
bttv_irq_switch_video(btv); bttv_irq_switch_video(btv);
if ((astat & BT848_INT_HLOCK) && btv->opt_automute) if ((astat & BT848_INT_HLOCK) && btv->opt_automute)
audio_mute(btv, btv->mute); /* trigger automute */ /* trigger automute */
audio_mux_gpio(btv, btv->audio_input, btv->mute);
if (astat & (BT848_INT_SCERR|BT848_INT_OCERR)) { if (astat & (BT848_INT_SCERR|BT848_INT_OCERR)) {
pr_info("%d: %s%s @ %08x,", pr_info("%d: %s%s @ %08x,",