Skip to content

L
linux-davinci
Commit c450e50e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (7263): Some cleanups at cx88 callback methods 

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent bc36a686
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 38 deletions
drivers/media/video/cx88/cx88-cards.c
View file @ c450e50e
...@@ -2062,34 +2062,22 @@ static int cx88_xc3028_geniatech_tuner_callback(void *priv, int command, int mod ...@@ -2062,34 +2062,22 @@ static int cx88_xc3028_geniatech_tuner_callback(void *priv, int command, int mod
case XC2028_TUNER_RESET: case XC2028_TUNER_RESET:
switch (INPUT(core->input).type) { switch (INPUT(core->input).type) {
case CX88_RADIO: case CX88_RADIO:
cx_write(MO_GP1_IO, 0x101010); break;
mdelay(50);
cx_write(MO_GP1_IO, 0x101000);
mdelay(50);
cx_write(MO_GP1_IO, 0x101010);
mdelay(50);
return 0;
case CX88_VMUX_DVB: case CX88_VMUX_DVB:
cx_write(MO_GP1_IO, 0x030302); cx_write(MO_GP1_IO, 0x030302);
mdelay(50); mdelay(50);
cx_write(MO_GP1_IO, 0x101010); break;
mdelay(50);
cx_write(MO_GP1_IO, 0x101000);
mdelay(50);
cx_write(MO_GP1_IO, 0x101010);
mdelay(50);
return 0;
default: default:
cx_write(MO_GP1_IO, 0x030301); cx_write(MO_GP1_IO, 0x030301);
mdelay(50); mdelay(50);
cx_write(MO_GP1_IO, 0x101010); }
mdelay(50); cx_write(MO_GP1_IO, 0x101010);
cx_write(MO_GP1_IO, 0x101000); mdelay(50);
mdelay(50); cx_write(MO_GP1_IO, 0x101000);
cx_write(MO_GP1_IO, 0x101010); mdelay(50);
mdelay(50); cx_write(MO_GP1_IO, 0x101010);
return 0; mdelay(50);
} return 0;
} }
return -EINVAL; return -EINVAL;
} }
...@@ -2145,7 +2133,6 @@ static int cx88_xc2028_tuner_callback(void *priv, int command, int arg) ...@@ -2145,7 +2133,6 @@ static int cx88_xc2028_tuner_callback(void *priv, int command, int arg)
switch (command) { switch (command) {
case XC2028_TUNER_RESET: case XC2028_TUNER_RESET:
{
switch (INPUT(core->input).type) { switch (INPUT(core->input).type) {
case CX88_RADIO: case CX88_RADIO:
printk(KERN_INFO "setting GPIO to radio!\n"); printk(KERN_INFO "setting GPIO to radio!\n");
...@@ -2153,25 +2140,19 @@ static int cx88_xc2028_tuner_callback(void *priv, int command, int arg) ...@@ -2153,25 +2140,19 @@ static int cx88_xc2028_tuner_callback(void *priv, int command, int arg)
mdelay(250); mdelay(250);
cx_write(MO_GP2_IO, 0xff); cx_write(MO_GP2_IO, 0xff);
mdelay(250); mdelay(250);
cx_write(MO_GP1_IO, 0x101010); break;
mdelay(250);
cx_write(MO_GP1_IO, 0x101000);
mdelay(250);
cx_write(MO_GP1_IO, 0x101010);
mdelay(250);
return 0;
case CX88_VMUX_DVB: /* Digital TV*/ case CX88_VMUX_DVB: /* Digital TV*/
default: /* Analog TV */ default: /* Analog TV */
printk(KERN_INFO "setting GPIO to TV!\n"); printk(KERN_INFO "setting GPIO to TV!\n");
cx_write(MO_GP1_IO, 0x101010); break;
mdelay(250);
cx_write(MO_GP1_IO, 0x101000);
mdelay(250);
cx_write(MO_GP1_IO, 0x101010);
mdelay(250);
return 0;
} }
} cx_write(MO_GP1_IO, 0x101010);
mdelay(250);
cx_write(MO_GP1_IO, 0x101000);
mdelay(250);
cx_write(MO_GP1_IO, 0x101010);
mdelay(250);
return 0;
} }
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment