aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttvp.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-28 11:48:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 08:16:57 -0200
commitb7c7a4bed8d695933ae172031556de9de30ae598 (patch)
tree397af41932d32c8ea30fbb0f1f2e30717b610911 /drivers/media/video/bt8xx/bttvp.h
parent[media] cx231xx: stray unlock on error path (diff)
downloadlinux-dev-b7c7a4bed8d695933ae172031556de9de30ae598.tar.xz
linux-dev-b7c7a4bed8d695933ae172031556de9de30ae598.zip
[media] bttv: remove custom_irq and gpioq from bttv struct
The RC5 old decoder used custom_irq to indicate the need of handling the IRQ on a different way. Instead of doing it, let the core just call the bttv input IRQ handler, and add the code there to call the legacy decoder. While here, remove the gpioq waitqueue, as this is not used anywhere, and add a debug msg to help removing the legacy RC5 code. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/bt8xx/bttvp.h')
-rw-r--r--drivers/media/video/bt8xx/bttvp.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 071232045605..9b776faf0741 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -139,7 +139,7 @@ struct bttv_ir {
int rc5_remote_gap;
/* RC5 gpio */
- u32 rc5_gpio;
+ bool rc5_gpio; /* Is RC5 legacy GPIO enabled? */
u32 last_bit; /* last raw bit seen */
u32 code; /* raw code under construction */
struct timeval base_time; /* time of last seen code */
@@ -364,12 +364,10 @@ struct bttv {
struct bttv_pll_info pll;
int triton1;
int gpioirq;
- int (*custom_irq)(struct bttv *btv);
int use_i2c_hw;
/* old gpio interface */
- wait_queue_head_t gpioq;
int shutdown;
void (*volume_gpio)(struct bttv *btv, __u16 volume);