From cd98e062e5519d25a044075f49e6dd955ddbda71 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Fri, 15 Jan 2010 08:49:41 -0300 Subject: [PATCH] --- yaml --- r: 202099 b: refs/heads/master c: 9059cd44403608f6554b37c3b3d5598ded7a3a92 h: refs/heads/master i: 202097: 1a9a7e509fe00a589e0c0ebe241de778982a7610 202095: fdbd6298caaf1da9d2579f927710f559f084ec4a v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/dib3000mb.c | 9 +-------- trunk/drivers/media/dvb/frontends/dib3000mb_priv.h | 4 ---- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 93e457012fa7..b3fd15469d31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7638699c253620a5745592d229b7e3ba9dbd218d +refs/heads/master: 9059cd44403608f6554b37c3b3d5598ded7a3a92 diff --git a/trunk/drivers/media/dvb/frontends/dib3000mb.c b/trunk/drivers/media/dvb/frontends/dib3000mb.c index ad4c8cfd8090..e80c59796368 100644 --- a/trunk/drivers/media/dvb/frontends/dib3000mb.c +++ b/trunk/drivers/media/dvb/frontends/dib3000mb.c @@ -38,11 +38,10 @@ #define DRIVER_DESC "DiBcom 3000M-B DVB-T demodulator" #define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@desy.de" -#ifdef CONFIG_DVB_DIBCOM_DEBUG static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-able))."); -#endif + #define deb_info(args...) dprintk(0x01,args) #define deb_i2c(args...) dprintk(0x02,args) #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 #define deb_setf(args...) dprintk(0x04,args) #define deb_getf(args...) dprintk(0x08,args) -#ifdef CONFIG_DVB_DIBCOM_DEBUG -static int debug; -module_param(debug, int, 0644); -MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c,4=srch (|-able))."); -#endif - static int dib3000_read_reg(struct dib3000_state *state, u16 reg) { u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff }; diff --git a/trunk/drivers/media/dvb/frontends/dib3000mb_priv.h b/trunk/drivers/media/dvb/frontends/dib3000mb_priv.h index 1a12747fdc91..16c526591f36 100644 --- a/trunk/drivers/media/dvb/frontends/dib3000mb_priv.h +++ b/trunk/drivers/media/dvb/frontends/dib3000mb_priv.h @@ -37,12 +37,8 @@ /* debug */ -#ifdef CONFIG_DVB_DIBCOM_DEBUG #define dprintk(level,args...) \ do { if ((debug & level)) { printk(args); } } while (0) -#else -#define dprintk(args...) do { } while (0) -#endif /* mask for enabling a specific pid for the pid_filter */ #define DIB3000_ACTIVATE_PID_FILTERING (0x2000)