Skip to contentSkip to conversation

dvb-usb: make some debug vars static

PATCH In review Adrian Bunk 2 participants 2 messages Nov 5, 2007 – Nov 6, 2007 Media (V4L/DVB)

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

 drivers/media/dvb/dvb-usb/cxusb.c  |    5 ++++-
 drivers/media/dvb/dvb-usb/cxusb.h  |    5 -----
 drivers/media/dvb/dvb-usb/digitv.c |    3 ++-
 drivers/media/dvb/dvb-usb/digitv.h |    3 ---
 drivers/media/dvb/dvb-usb/opera1.c |    6 ++++--
 drivers/media/dvb/dvb-usb/opera1.h |    9 ---------
 drivers/media/dvb/dvb-usb/vp7045.c |    5 ++++-
 drivers/media/dvb/dvb-usb/vp7045.h |    5 -----
 8 files changed, 14 insertions(+), 27 deletions(-)

86038dd7d3d897cb762555ee79063945513dc93f

drivers/media/dvb/dvb-usb/cxusb.c +4 -1
index 04e31cf..5b6431e 100644
@@ -32,9 +32,12 @@
 #include "zl10353.h"
 
 /* debug */
-int dvb_usb_cxusb_debug;
+static int dvb_usb_cxusb_debug;
 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);
+#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,
 			  u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
drivers/media/dvb/dvb-usb/cxusb.h +0 -5
index c8ef775..79ca7ab 100644
@@ -4,11 +4,6 @@
 #define DVB_USB_LOG_PREFIX "cxusb"
 #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 */
 #define CMD_I2C_WRITE     0x08
 #define CMD_I2C_READ      0x09
drivers/media/dvb/dvb-usb/digitv.c +2 -1
index bca1e09..3acbda4 100644
@@ -17,9 +17,10 @@
 #include "nxt6000.h"
 
 /* debug */
-int dvb_usb_digitv_debug;
+static int dvb_usb_digitv_debug;
 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);
+#define deb_rc(args...)   dprintk(dvb_usb_digitv_debug,0x01,args)
 
 static int digitv_ctrl_msg(struct dvb_usb_device *d,
 		u8 cmd, u8 vv, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
drivers/media/dvb/dvb-usb/digitv.h +0 -3
index 8b43e3d..908c09f 100644
@@ -8,9 +8,6 @@ struct digitv_state {
     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:
  *
  * Always 7 bytes bulk message(s) for controlling
drivers/media/dvb/dvb-usb/opera1.c +4 -2
index d7c0495..21935bf 100644
@@ -10,7 +10,9 @@
 * 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"
 
 #define OPERA_READ_MSG 0

@@ -38,7 +40,7 @@ struct opera_rc_keys {
 	u32 event;
 };
 
-int dvb_usb_opera1_debug;
+static int dvb_usb_opera1_debug;
 module_param_named(debug, dvb_usb_opera1_debug, int, 0644);
 MODULE_PARM_DESC(debug,
 		 "set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64 (or-able))."
drivers/media/dvb/dvb-usb/opera1.h deleted +0 -9
deleted file mode 100644
index 5317442..0000000
@@ -1,9 +0,0 @@
-#ifndef _OPERA1_H_
-#define _OPERA1_H_
-
-#define DVB_USB_LOG_PREFIX "opera"
-#include "dvb-usb.h"
-
-extern int dvb_usb_opera1_debug;
-#define deb_xfer(args...) dprintk(dvb_usb_opera1_debug,0x02,args)
-#endif
drivers/media/dvb/dvb-usb/vp7045.c +4 -1
index 5bbd2d5..c172bab 100644
@@ -15,9 +15,12 @@
 #include "vp7045.h"
 
 /* debug */
-int dvb_usb_vp7045_debug;
+static int dvb_usb_vp7045_debug;
 module_param_named(debug,dvb_usb_vp7045_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))." DVB_USB_DEBUG_STATUS);
+#define deb_info(args...) dprintk(dvb_usb_vp7045_debug,0x01,args)
+#define deb_xfer(args...) dprintk(dvb_usb_vp7045_debug,0x02,args)
+#define deb_rc(args...)   dprintk(dvb_usb_vp7045_debug,0x04,args)
 
 int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, int inlen, int msec)
 {
drivers/media/dvb/dvb-usb/vp7045.h +0 -5
index 9ce21a2..969688f 100644
@@ -17,11 +17,6 @@
 #define DVB_USB_LOG_PREFIX "vp7045"
 #include "dvb-usb.h"
 
-extern int dvb_usb_vp7045_debug;
-#define deb_info(args...) dprintk(dvb_usb_vp7045_debug,0x01,args)
-#define deb_xfer(args...) dprintk(dvb_usb_vp7045_debug,0x02,args)
-#define deb_rc(args...)   dprintk(dvb_usb_vp7045_debug,0x04,args)
-
 /* vp7045 commands */
 
 /* Twinhan Vendor requests */
Reviewed-by on v1 1/1
#1 lore raw

Re: [v4l-dvb-maintainer] [2.6 patch] dvb-usb: make some debug var s static

Quoted 7 lines · Adrian Bunk

This patch makes some needlessly global debug variables static.

opera1.h became so small that I removed it.

Signed-off-by Adrian Bunk <[email protected]>
Reviewed-by Michael Krufky <[email protected]>

Mauro, please apply.

-Mike

Quoted 12 lines

---

 drivers/media/dvb/dvb-usb/cxusb.c  |    5 ++++-
 drivers/media/dvb/dvb-usb/cxusb.h  |    5 -----
 drivers/media/dvb/dvb-usb/digitv.c |    3 ++-
 drivers/media/dvb/dvb-usb/digitv.h |    3 ---
 drivers/media/dvb/dvb-usb/opera1.c |    6 ++++--
 drivers/media/dvb/dvb-usb/opera1.h |    9 ---------
 drivers/media/dvb/dvb-usb/vp7045.c |    5 ++++-
 drivers/media/dvb/dvb-usb/vp7045.h |    5 -----
 8 files changed, 14 insertions(+), 27 deletions(-)

Review

Quoted 2 lines

86038dd7d3d897cb762555ee79063945513dc93f

(quoted diff) +0 -0

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

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

Quoted 11 lines

index 04e31cf..5b6431e 100644

drivers/media/dvb/dvb-usb/cxusb.c +1 -1
@@ -32,9 +32,12 @@
 #include "zl10353.h"
 
 /* debug */
-int dvb_usb_cxusb_debug;
+static int dvb_usb_cxusb_debug;
 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);

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

Quoted 2 lines
drivers/media/dvb/dvb-usb/cxusb.c +2 -0
+#define deb_info(args...)   dprintk(dvb_usb_cxusb_debug,0x01,args)
+#define deb_i2c(args...)    if (d->udev->descriptor.idVendor ==

USB_VID_MEDION) \

Review

Quoted 5 lines
drivers/media/dvb/dvb-usb/cxusb.c +1 -0
+				dprintk(dvb_usb_cxusb_debug,0x01,args)
 
 static int cxusb_ctrl_msg(struct dvb_usb_device *d,
 			  u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
(quoted diff) +0 -0

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

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

Quoted 10 lines

index c8ef775..79ca7ab 100644

drivers/media/dvb/dvb-usb/cxusb.h +0 -3
@@ -4,11 +4,6 @@
 #define DVB_USB_LOG_PREFIX "cxusb"
 #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) \

Review

Quoted 6 lines
drivers/media/dvb/dvb-usb/cxusb.h +0 -2
-				dprintk(dvb_usb_cxusb_debug,0x01,args)
-
 /* usb commands - some of it are guesses, don't have a reference yet */
 #define CMD_I2C_WRITE     0x08
 #define CMD_I2C_READ      0x09
(quoted diff) +0 -0

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

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

Quoted 11 lines

index bca1e09..3acbda4 100644

drivers/media/dvb/dvb-usb/digitv.c +1 -1
@@ -17,9 +17,10 @@
 #include "nxt6000.h"
 
 /* debug */
-int dvb_usb_digitv_debug;
+static int dvb_usb_digitv_debug;
 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);

Review

Quoted 5 lines
drivers/media/dvb/dvb-usb/digitv.c +1 -0
+#define deb_rc(args...)   dprintk(dvb_usb_digitv_debug,0x01,args)
 
 static int digitv_ctrl_msg(struct dvb_usb_device *d,
 		u8 cmd, u8 vv, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
(quoted diff) +0 -0

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

Review

Quoted 14 lines

index 8b43e3d..908c09f 100644

drivers/media/dvb/dvb-usb/digitv.h +0 -3
@@ -8,9 +8,6 @@ struct digitv_state {
     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:
  *
  * Always 7 bytes bulk message(s) for controlling
(quoted diff) +0 -0

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

Quoted 15 lines

index d7c0495..21935bf 100644

drivers/media/dvb/dvb-usb/opera1.c +3 -1
@@ -10,7 +10,9 @@
 * 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"
 
 #define OPERA_READ_MSG 0

drivers/media/dvb/dvb-usb/opera1.c struct opera_rc_keys { · line 46

Quoted 8 lines
drivers/media/dvb/dvb-usb/opera1.c +1 -1
@@ -38,7 +40,7 @@ struct opera_rc_keys {
 	u32 event;
 };
 
-int dvb_usb_opera1_debug;
+static int dvb_usb_opera1_debug;
 module_param_named(debug, dvb_usb_opera1_debug, int, 0644);
 MODULE_PARM_DESC(debug,
 		 "set debugging level

(1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64 (or-able))."

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/media/dvb/dvb-usb/opera1.h

Review

Quoted 15 lines

deleted file mode 100644
index 5317442..0000000

drivers/media/dvb/dvb-usb/opera1.h deleted +0 -9
@@ -1,9 +0,0 @@
-#ifndef _OPERA1_H_
-#define _OPERA1_H_
-
-#define DVB_USB_LOG_PREFIX "opera"
-#include "dvb-usb.h"
-
-extern int dvb_usb_opera1_debug;
-#define deb_xfer(args...) dprintk(dvb_usb_opera1_debug,0x02,args)
-#endif
(quoted diff) +0 -0

b/drivers/media/dvb/dvb-usb/vp7045.c

drivers/media/dvb/dvb-usb/vp7045.c line 20

Quoted 11 lines

index 5bbd2d5..c172bab 100644

drivers/media/dvb/dvb-usb/vp7045.c +1 -1
@@ -15,9 +15,12 @@
 #include "vp7045.h"
 
 /* debug */
-int dvb_usb_vp7045_debug;
+static int dvb_usb_vp7045_debug;
 module_param_named(debug,dvb_usb_vp7045_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4

(or-able))." DVB_USB_DEBUG_STATUS);

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

Quoted 5 lines
drivers/media/dvb/dvb-usb/vp7045.c +3 -0
+#define deb_info(args...) dprintk(dvb_usb_vp7045_debug,0x01,args)
+#define deb_xfer(args...) dprintk(dvb_usb_vp7045_debug,0x02,args)
+#define deb_rc(args...)   dprintk(dvb_usb_vp7045_debug,0x04,args)
 
 int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen,

u8 *in, int inlen, int msec)

Review

Quoted 2 lines
drivers/media/dvb/dvb-usb/vp7045.c +0 -0
 {
(quoted diff) +0 -0

b/drivers/media/dvb/dvb-usb/vp7045.h

Quoted 21 lines

index 9ce21a2..969688f 100644

drivers/media/dvb/dvb-usb/vp7045.h +0 -5
@@ -17,11 +17,6 @@
 #define DVB_USB_LOG_PREFIX "vp7045"
 #include "dvb-usb.h"
 
-extern int dvb_usb_vp7045_debug;
-#define deb_info(args...) dprintk(dvb_usb_vp7045_debug,0x01,args)
-#define deb_xfer(args...) dprintk(dvb_usb_vp7045_debug,0x02,args)
-#define deb_rc(args...)   dprintk(dvb_usb_vp7045_debug,0x04,args)
-
 /* vp7045 commands */
 
 /* Twinhan Vendor requests */

_______________________________________________
v4l-dvb-maintainer mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/v4l-dvb-maintainer