Commit 9059cd44 authored by Christoph Egger's avatar Christoph Egger Committed by Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7638699c

drivers/media/dvb/frontends/dib3000mb.c

+1 −8
Original line number Diff line number Diff line
@@ -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 };

drivers/media/dvb/frontends/dib3000mb_priv.h

+0 −4
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE