diff options
author | Christoph Egger <siccegge@stud.informatik.uni-erlangen.de> | 2010-01-15 06:49:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 15:42:46 -0400 |
commit | 9059cd44403608f6554b37c3b3d5598ded7a3a92 (patch) | |
tree | b4bd1253a964cf17f602104aa77c8c260ff5a13b | |
parent | 7638699c253620a5745592d229b7e3ba9dbd218d (diff) |
V4L/DVB: remove obsolete conditionalizing on DVB_DIBCOM_DEBUG
As pointed by Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>,
The config Option DVB_DIBCOM_DEBUG was dropped while removing the dibusb
driver in favor of dvb-usb in 2005. However it remaind existant at some
places of the kernel config.
Instead of just removing the debug capability, the better is to just remove
the bad dependency, making the modprobe function always visible.
Thanks-to: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/frontends/dib3000mb.c | 9 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/dib3000mb_priv.h | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c index ad4c8cfd8090..e80c59796368 100644 --- a/drivers/media/dvb/frontends/dib3000mb.c +++ b/drivers/media/dvb/frontends/dib3000mb.c | |||
@@ -38,11 +38,10 @@ | |||
38 | #define DRIVER_DESC "DiBcom 3000M-B DVB-T demodulator" | 38 | #define DRIVER_DESC "DiBcom 3000M-B DVB-T demodulator" |
39 | #define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@desy.de" | 39 | #define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@desy.de" |
40 | 40 | ||
41 | #ifdef CONFIG_DVB_DIBCOM_DEBUG | ||
42 | static int debug; | 41 | static int debug; |
43 | module_param(debug, int, 0644); | 42 | module_param(debug, int, 0644); |
44 | MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-able))."); | 43 | MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-able))."); |
45 | #endif | 44 | |
46 | #define deb_info(args...) dprintk(0x01,args) | 45 | #define deb_info(args...) dprintk(0x01,args) |
47 | #define deb_i2c(args...) dprintk(0x02,args) | 46 | #define deb_i2c(args...) dprintk(0x02,args) |
48 | #define deb_srch(args...) dprintk(0x04,args) | 47 | #define deb_srch(args...) dprintk(0x04,args) |
@@ -51,12 +50,6 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-a | |||
51 | #define deb_setf(args...) dprintk(0x04,args) | 50 | #define deb_setf(args...) dprintk(0x04,args) |
52 | #define deb_getf(args...) dprintk(0x08,args) | 51 | #define deb_getf(args...) dprintk(0x08,args) |
53 | 52 | ||
54 | #ifdef CONFIG_DVB_DIBCOM_DEBUG | ||
55 | static int debug; | ||
56 | module_param(debug, int, 0644); | ||
57 | MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c,4=srch (|-able))."); | ||
58 | #endif | ||
59 | |||
60 | static int dib3000_read_reg(struct dib3000_state *state, u16 reg) | 53 | static int dib3000_read_reg(struct dib3000_state *state, u16 reg) |
61 | { | 54 | { |
62 | u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff }; | 55 | u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff }; |
diff --git a/drivers/media/dvb/frontends/dib3000mb_priv.h b/drivers/media/dvb/frontends/dib3000mb_priv.h index 1a12747fdc91..16c526591f36 100644 --- a/drivers/media/dvb/frontends/dib3000mb_priv.h +++ b/drivers/media/dvb/frontends/dib3000mb_priv.h | |||
@@ -37,12 +37,8 @@ | |||
37 | 37 | ||
38 | /* debug */ | 38 | /* debug */ |
39 | 39 | ||
40 | #ifdef CONFIG_DVB_DIBCOM_DEBUG | ||
41 | #define dprintk(level,args...) \ | 40 | #define dprintk(level,args...) \ |
42 | do { if ((debug & level)) { printk(args); } } while (0) | 41 | do { if ((debug & level)) { printk(args); } } while (0) |
43 | #else | ||
44 | #define dprintk(args...) do { } while (0) | ||
45 | #endif | ||
46 | 42 | ||
47 | /* mask for enabling a specific pid for the pid_filter */ | 43 | /* mask for enabling a specific pid for the pid_filter */ |
48 | #define DIB3000_ACTIVATE_PID_FILTERING (0x2000) | 44 | #define DIB3000_ACTIVATE_PID_FILTERING (0x2000) |