2 files changed, 4 insertions, 8 deletions

diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index 1541c62ddf5f..c79ddfa6f53c 100644
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -295,9 +295,10 @@ struct NCR5380_hostdata {
 #define NDEBUG (0)
 #endif
 
+#define dprintk(flg, fmt, ...) \
+        do { if ((NDEBUG) & (flg)) pr_debug(fmt, ## __VA_ARGS__); } while (0)
+
 #if NDEBUG
-#define dprintk(flg, fmt, args...) \
-        do { if ((NDEBUG) & (flg)) pr_debug(fmt, ## args); } while (0)
 #define NCR5380_dprint(flg, arg) \
         do { if ((NDEBUG) & (flg)) NCR5380_print(arg); } while (0)
 #define NCR5380_dprint_phase(flg, arg) \
@@ -305,7 +306,6 @@ struct NCR5380_hostdata {
 static void NCR5380_print_phase(struct Scsi_Host *instance);
 static void NCR5380_print(struct Scsi_Host *instance);
 #else
-#define dprintk(flg, fmt, args...)     do {} while (0)
 #define NCR5380_dprint(flg, arg)       do {} while (0)
 #define NCR5380_dprint_phase(flg, arg) do {} while (0)
 #endif
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 61a2c101b4bc..88220794cc98 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -1006,12 +1006,8 @@ static void NCR5380_main (struct work_struct *bl)
             for (tmp = (struct scsi_cmnd *) hostdata->issue_queue,
                  prev = NULL; tmp; prev = tmp, tmp = NEXT(tmp) ) {
 
-#if (NDEBUG & NDEBUG_LISTS)
                 if (prev != tmp)
-                    printk("MAIN tmp=%p   target=%d   busy=%d lun=%d\n",
-                           tmp, tmp->target, hostdata->busy[tmp->target],
-                           tmp->lun);
-#endif
+                        dprintk(NDEBUG_LISTS, "MAIN tmp=%p   target=%d   busy=%d lun=%d\n", tmp, tmp->device->id, hostdata->busy[tmp->device->id], tmp->device->lun);
                 /*  When we find one, remove it from the issue queue. */
                 /* ++guenther: possible race with Falcon locking */
                 if (