diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-09-28 00:46:49 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:51 -0500 |
commit | 26f48eaa9e57a3436fc049f30241256dda002de5 (patch) | |
tree | 71a222da749f3c7bd80e888163bdc0231fbd2aab /drivers/media/dvb/dvb-usb/m920x.h | |
parent | e2adbecf72d54515b66f8631813ec49069669d5e (diff) |
V4L/DVB (5131): M920x: more cleanups
Some cleanups and suggestions from Patrick Boettcher.
Dropped the mutex in m9206_rc_query using #if 0, because
M9206_CORE, M9206_I2C, M9206_FILTER and M9206_FW can be accessed
concurrently.
Thanks to both Aapo Tahkola and Patrick Boettcher.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/m920x.h')
-rw-r--r-- | drivers/media/dvb/dvb-usb/m920x.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.h b/drivers/media/dvb/dvb-usb/m920x.h index 709b7d205b6d..597df11e6ea0 100644 --- a/drivers/media/dvb/dvb-usb/m920x.h +++ b/drivers/media/dvb/dvb-usb/m920x.h | |||
@@ -4,15 +4,14 @@ | |||
4 | #define DVB_USB_LOG_PREFIX "m920x" | 4 | #define DVB_USB_LOG_PREFIX "m920x" |
5 | #include "dvb-usb.h" | 5 | #include "dvb-usb.h" |
6 | 6 | ||
7 | extern int dvb_usb_m920x_debug; | ||
8 | #define deb_rc(args...) dprintk(dvb_usb_m920x_debug,0x01,args) | 7 | #define deb_rc(args...) dprintk(dvb_usb_m920x_debug,0x01,args) |
9 | 8 | ||
10 | #define M9206_CORE 0x22 | 9 | #define M9206_CORE 0x22 |
11 | #define M9206_RC_STATE 0xff51 | 10 | #define M9206_RC_STATE 0xff51 |
12 | #define M9206_RC_KEY 0xff52 | 11 | #define M9206_RC_KEY 0xff52 |
13 | #define M9206_RC_INIT1 0xff54 | 12 | #define M9206_RC_INIT1 0xff54 |
14 | #define M9206_RC_INIT2 0xff55 | 13 | #define M9206_RC_INIT2 0xff55 |
15 | #define M9206_FW_GO 0xff69 | 14 | #define M9206_FW_GO 0xff69 |
16 | 15 | ||
17 | #define M9206_I2C 0x23 | 16 | #define M9206_I2C 0x23 |
18 | #define M9206_FILTER 0x25 | 17 | #define M9206_FILTER 0x25 |
@@ -24,5 +23,4 @@ struct m9206_state { | |||
24 | int filtering_enabled; | 23 | int filtering_enabled; |
25 | int rep_count; | 24 | int rep_count; |
26 | }; | 25 | }; |
27 | |||
28 | #endif | 26 | #endif |