V4L/DVB (5884): zr36067: clean up debug function

Debugging cleanups to the zr36067 driver:

* Use module_param_named() to declare the debug parameter, so we can
  use a single global variable to handle the debug level. This makes
  the driver a bit smaller (by 648 bytes on x86_64), thanks to one
  less level of indirection on every use.

* Change the debug parameter sysfs permissions, so that the debug
  level can be adjusted at runtime, as is done in many other
  media/video drivers.

* The debug level is between 0 and 5, not 0 and 4.

* Move the zr_debug export and dprintk macro definition to a header
  file so that we don't have to define them in each source file.

* Simplify a duplicate test on zr_debug.

Note that zr_debug was subsequently renamed to debug_zr36067 to avoid
possible conflicts with other Zoran device drivers, on a suggestion
by Trent Piepho.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Acked-by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index ba2f4ed29483..dc1ec20fb266 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -52,6 +52,7 @@
 #include "videocodec.h"
 #include "zoran.h"
 #include "zoran_device.h"
+#include "zoran_card.h"
 
 #define IRQ_MASK ( ZR36057_ISR_GIRQ0 | \
                    ZR36057_ISR_GIRQ1 | \
@@ -59,14 +60,6 @@
 
 extern const struct zoran_format zoran_formats[];
 
-extern int *zr_debug;
-
-#define dprintk(num, format, args...) \
-        do { \
-                if (*zr_debug >= num) \
-                        printk(format, ##args); \
-        } while (0)
-
 static int lml33dpath = 0;      /* 1 will use digital path in capture
                                  * mode instead of analog. It can be
                                  * used for picture adjustments using
@@ -174,7 +167,7 @@ post_office_read (struct zoran *zr,
 static void
 dump_guests (struct zoran *zr)
 {
-        if (*zr_debug > 2) {
+        if (zr36067_debug > 2) {
                 int i, guest[8];
 
                 for (i = 1; i < 8; i++) {       // Don't read jpeg codec here
@@ -1271,7 +1264,7 @@ error_handler (struct zoran *zr,
                 zr->num_errors++;
 
                 /* Report error */
-                if (*zr_debug > 1 && zr->num_errors <= 8) {
+                if (zr36067_debug > 1 && zr->num_errors <= 8) {
                         long frame;
                         frame =
                             zr->jpg_pend[zr->jpg_dma_tail & BUZ_MASK_FRAME];
@@ -1531,7 +1524,7 @@ zoran_irq (int             irq,
 
                         if (zr->codec_mode == BUZ_MODE_MOTION_DECOMPRESS ||
                             zr->codec_mode == BUZ_MODE_MOTION_COMPRESS) {
-                                if (*zr_debug > 1 &&
+                                if (zr36067_debug > 1 &&
                                     (!zr->frame_num || zr->JPEG_error)) {
                                         printk(KERN_INFO
                                                "%s: first frame ready: state=0x%08x odd_even=%d field_per_buff=%d delay=%d\n",
@@ -1568,7 +1561,7 @@ zoran_irq (int             irq,
                                                     zr->JPEG_missed;
                                 }
 
-                                if (*zr_debug > 2 && zr->frame_num < 6) {
+                                if (zr36067_debug > 2 && zr->frame_num < 6) {
                                         int i;
                                         printk("%s: seq=%ld stat_com:",
                                                ZR_DEVNAME(zr), zr->jpg_seq_num);