aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dvb-usb/m920x.h
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-09-28 01:46:49 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:51 -0200
commit26f48eaa9e57a3436fc049f30241256dda002de5 (patch)
tree71a222da749f3c7bd80e888163bdc0231fbd2aab /drivers/media/dvb/dvb-usb/m920x.h
parente2adbecf72d54515b66f8631813ec49069669d5e (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.h12
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 709b7d205b6..597df11e6ea 100644
--- a/drivers/media/dvb/dvb-usb/m920x.h
+++ b/drivers/media/dvb/dvb-usb/m920x.h
@@ -4,15 +4,14 @@
#define DVB_USB_LOG_PREFIX "m920x"
#include "dvb-usb.h"
-extern int dvb_usb_m920x_debug;
#define deb_rc(args...) dprintk(dvb_usb_m920x_debug,0x01,args)
#define M9206_CORE 0x22
-#define M9206_RC_STATE 0xff51
-#define M9206_RC_KEY 0xff52
-#define M9206_RC_INIT1 0xff54
-#define M9206_RC_INIT2 0xff55
-#define M9206_FW_GO 0xff69
+#define M9206_RC_STATE 0xff51
+#define M9206_RC_KEY 0xff52
+#define M9206_RC_INIT1 0xff54
+#define M9206_RC_INIT2 0xff55
+#define M9206_FW_GO 0xff69
#define M9206_I2C 0x23
#define M9206_FILTER 0x25
@@ -24,5 +23,4 @@ struct m9206_state {
int filtering_enabled;
int rep_count;
};
-
#endif