Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53133afb authored Nov 05, 2007 by Adrian Bunk Committed by Mauro Carvalho Chehab Jan 25, 2008

V4L/DVB (6578): dvb-usb: make some debug vars static



This patch makes some needlessly global debug variables static.

opera1.h became so small that I removed it.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

parent f760d618

drivers/media/dvb/dvb-usb/cxusb.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,9 +32,12 @@
	#include "zl10353.h"		#include "zl10353.h"

	/* debug */		/* debug */
	int dvb_usb_cxusb_debug;		static int dvb_usb_cxusb_debug;
	module_param_named(debug, dvb_usb_cxusb_debug, int, 0644);		module_param_named(debug, dvb_usb_cxusb_debug, int, 0644);
	MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);		MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
			#define deb_info(args...) dprintk(dvb_usb_cxusb_debug,0x01,args)
			#define deb_i2c(args...) if (d->udev->descriptor.idVendor == USB_VID_MEDION) \
			dprintk(dvb_usb_cxusb_debug,0x01,args)

	static int cxusb_ctrl_msg(struct dvb_usb_device *d,		static int cxusb_ctrl_msg(struct dvb_usb_device *d,
	u8 cmd, u8 wbuf, int wlen, u8 rbuf, int rlen)		u8 cmd, u8 wbuf, int wlen, u8 rbuf, int rlen)

drivers/media/dvb/dvb-usb/cxusb.h

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4,11 +4,6 @@
	#define DVB_USB_LOG_PREFIX "cxusb"		#define DVB_USB_LOG_PREFIX "cxusb"
	#include "dvb-usb.h"		#include "dvb-usb.h"

	extern int dvb_usb_cxusb_debug;
	#define deb_info(args...) dprintk(dvb_usb_cxusb_debug,0x01,args)
	#define deb_i2c(args...) if (d->udev->descriptor.idVendor == USB_VID_MEDION) \
	dprintk(dvb_usb_cxusb_debug,0x01,args)

	/* usb commands - some of it are guesses, don't have a reference yet */		/* usb commands - some of it are guesses, don't have a reference yet */
	#define CMD_I2C_WRITE 0x08		#define CMD_I2C_WRITE 0x08
	#define CMD_I2C_READ 0x09		#define CMD_I2C_READ 0x09

drivers/media/dvb/dvb-usb/digitv.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,9 +17,10 @@
	#include "nxt6000.h"		#include "nxt6000.h"

	/* debug */		/* debug */
	int dvb_usb_digitv_debug;		static int dvb_usb_digitv_debug;
	module_param_named(debug,dvb_usb_digitv_debug, int, 0644);		module_param_named(debug,dvb_usb_digitv_debug, int, 0644);
	MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);		MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
			#define deb_rc(args...) dprintk(dvb_usb_digitv_debug,0x01,args)

	static int digitv_ctrl_msg(struct dvb_usb_device *d,		static int digitv_ctrl_msg(struct dvb_usb_device *d,
	u8 cmd, u8 vv, u8 wbuf, int wlen, u8 rbuf, int rlen)		u8 cmd, u8 vv, u8 wbuf, int wlen, u8 rbuf, int rlen)

drivers/media/dvb/dvb-usb/digitv.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -8,9 +8,6 @@ struct digitv_state {
	int is_nxt6000;		int is_nxt6000;
	};		};

	extern int dvb_usb_digitv_debug;
	#define deb_rc(args...) dprintk(dvb_usb_digitv_debug,0x01,args)

	/* protocol (from usblogging and the SDK:		/* protocol (from usblogging and the SDK:
	*		*
	* Always 7 bytes bulk message(s) for controlling		* Always 7 bytes bulk message(s) for controlling

drivers/media/dvb/dvb-usb/opera1.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,9 @@
	* see Documentation/dvb/README.dvb-usb for more information		* see Documentation/dvb/README.dvb-usb for more information
	*/		*/

	#include "opera1.h"		#define DVB_USB_LOG_PREFIX "opera"

			#include "dvb-usb.h"
	#include "stv0299.h"		#include "stv0299.h"

	#define OPERA_READ_MSG 0		#define OPERA_READ_MSG 0
	@@ -38,7 +40,7 @@ struct opera_rc_keys {
	u32 event;		u32 event;
	};		};

	int dvb_usb_opera1_debug;		static int dvb_usb_opera1_debug;
	module_param_named(debug, dvb_usb_opera1_debug, int, 0644);		module_param_named(debug, dvb_usb_opera1_debug, int, 0644);
	MODULE_PARM_DESC(debug,		MODULE_PARM_DESC(debug,
	"set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64 (or-able))."		"set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64 (or-able))."