From edb4c25ca3a7997660500692eca3510eac9726e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20H=C3=83=C2=A4rdeman?= <david@hardeman.nu>
Date: Fri, 19 Nov 2010 20:43:12 -0300
Subject: [media] bttv: rename struct card_ir to bttv_ir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
bttv_ir is more consistent with all other structs used in the same driver.
Also, clean up the struct to remove commented out members and the work_struct
which is unused.
[mchehab@redhat.com: fix a warning at bttv_rc5_timer_end]
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/video/bt8xx/bttvp.h | 31 +++++++++----------------------
1 file changed, 9 insertions(+), 22 deletions(-)
(limited to 'drivers/media/video/bt8xx/bttvp.h')
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index b71d04d12085..3d5b2bc1d376 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -120,15 +120,12 @@ struct bttv_format {
int hshift,vshift; /* for planar modes */
};
-struct card_ir {
+struct bttv_ir {
struct rc_dev *dev;
char name[32];
char phys[32];
-#if 0
- int users;
- u32 running:1;
-#endif
+
/* Usual gpio signalling */
u32 mask_keycode;
u32 mask_keydown;
@@ -139,25 +136,15 @@ struct card_ir {
int start; // What should RC5_START() be
int addr; // What RC5_ADDR() should be.
int rc5_remote_gap;
- struct work_struct work;
struct timer_list timer;
/* RC5 gpio */
- u32 rc5_gpio;
- struct timer_list timer_end; /* timer_end for code completion */
- u32 last_bit; /* last raw bit seen */
- u32 code; /* raw code under construction */
- struct timeval base_time; /* time of last seen code */
- int active; /* building raw code */
-
-#if 0
- /* NEC decoding */
- u32 nec_gpio;
- struct tasklet_struct tlet;
-
- /* IR core raw decoding */
- u32 raw_decode;
-#endif
+ u32 rc5_gpio;
+ struct timer_list timer_end; /* timer_end for code completion */
+ u32 last_bit; /* last raw bit seen */
+ u32 code; /* raw code under construction */
+ struct timeval base_time; /* time of last seen code */
+ bool active; /* building raw code */
};
@@ -408,7 +395,7 @@ struct bttv {
/* infrared remote */
int has_remote;
- struct card_ir *remote;
+ struct bttv_ir *remote;
/* I2C remote data */
struct IR_i2c_init_data init_data;
--
cgit v1.2.1