[PATCH v4 03/78] ncr5380: Eliminate PDEBUG*, TDEBUG* and DTCDEBUG* macros
Replace {P,T,DTC}DEBUG_INIT with NDEBUG_INIT. Remove dead debugging
code, including code that's conditional upon *DEBUG_TRANSFER.
Signed-off-by: Finn Thain
Reviewed-by: Hannes Reinecke
---
drivers/scsi/dtc.c | 18 ++
drivers/scsi/dtc.h | 27 ---
drivers/scsi/pas16.c | 21 +++--
drivers/scsi/pas16.h | 16
drivers/scsi/t128.c | 18 ++
drivers/scsi/t128.h | 16
6 files changed, 19 insertions(+), 97 deletions(-)
Index: linux/drivers/scsi/dtc.c
===
--- linux.orig/drivers/scsi/dtc.c 2016-01-03 16:02:42.0 +1100
+++ linux/drivers/scsi/dtc.c2016-01-03 16:02:47.0 +1100
@@ -205,9 +205,8 @@ static int __init dtc_detect(struct scsi
addr = 0;
} else
for (; !addr && (current_base < NO_BASES);
++current_base) {
-#if (DTCDEBUG & DTCDEBUG_INIT)
- printk(KERN_DEBUG "scsi-dtc : probing address
%08x\n", bases[current_base].address);
-#endif
+ dprintk(NDEBUG_INIT, "dtc: probing address
0x%08x\n",
+ (unsigned
int)bases[current_base].address);
if (bases[current_base].noauto)
continue;
base = ioremap(bases[current_base].address,
0x2000);
@@ -216,18 +215,14 @@ static int __init dtc_detect(struct scsi
for (sig = 0; sig < NO_SIGNATURES; ++sig) {
if (check_signature(base +
signatures[sig].offset, signatures[sig].string,
strlen(signatures[sig].string))) {
addr =
bases[current_base].address;
-#if (DTCDEBUG & DTCDEBUG_INIT)
- printk(KERN_DEBUG "scsi-dtc :
detected board.\n");
-#endif
+ dprintk(NDEBUG_INIT, "dtc:
detected board\n");
goto found;
}
}
iounmap(base);
}
-#if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT)
- printk(KERN_DEBUG "scsi-dtc : base = %08x\n", addr);
-#endif
+ dprintk(NDEBUG_INIT, "dtc: addr = 0x%08x\n", addr);
if (!addr)
break;
@@ -271,9 +266,8 @@ found:
printk(KERN_WARNING "scsi%d : interrupts not used.
Might as well not jumper it.\n", instance->host_no);
instance->irq = NO_IRQ;
#endif
-#if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT)
- printk("scsi%d : irq = %d\n", instance->host_no, instance->irq);
-#endif
+ dprintk(NDEBUG_INIT, "scsi%d : irq = %d\n",
+ instance->host_no, instance->irq);
++current_override;
++count;
Index: linux/drivers/scsi/dtc.h
===
--- linux.orig/drivers/scsi/dtc.h 2016-01-03 16:02:39.0 +1100
+++ linux/drivers/scsi/dtc.h2016-01-03 16:02:47.0 +1100
@@ -10,10 +10,6 @@
#ifndef DTC3280_H
#define DTC3280_H
-#define DTCDEBUG 0
-#define DTCDEBUG_INIT 0x1
-#define DTCDEBUG_TRANSFER 0x2
-
#ifndef CMD_PER_LUN
#define CMD_PER_LUN 2
#endif
@@ -33,31 +29,8 @@
#define DTC_address(reg) (base + DTC_5380_OFFSET + reg)
-#define dbNCR5380_read(reg) \
-(rval=readb(DTC_address(reg)), \
- (((unsigned char) printk("DTC : read register %d at addr %p is: %02x\n"\
-, (reg), DTC_address(reg), rval)), rval ) )
-
-#define dbNCR5380_write(reg, value) do { \
-printk("DTC : write %02x to register %d at address %p\n", \
-(value), (reg), DTC_address(reg)); \
-writeb(value, DTC_address(reg));} while(0)
-
-
-#if !(DTCDEBUG & DTCDEBUG_TRANSFER)
#define NCR5380_read(reg) (readb(DTC_address(reg)))
#define NCR5380_write(reg, value) (writeb(value, DTC_address(reg)))
-#else
-#define NCR5380_read(reg) (readb(DTC_address(reg)))
-#define xNCR5380_read(reg) \
-(((unsigned char) printk("DTC : read register %d at address %p\n"\
-, (reg), DTC_address(reg))), readb(DTC_address(reg)))
-
-#define NCR5380_write(reg, value) do { \
-printk("DTC : write %02x to register %d at address %p\n", \
- (value), (reg), DTC_address(reg)); \
-writeb(value, DTC_address(reg));} while(0)
-#endif
#define NCR5380_intr dtc_intr
#define NCR5380_queue_command dtc_queue_command
Index: linux/drivers/scsi/pas16.c
[PATCH v4 03/78] ncr5380: Eliminate PDEBUG*, TDEBUG* and DTCDEBUG* macros
Replace {P,T,DTC}DEBUG_INIT with NDEBUG_INIT. Remove dead debugging
code, including code that's conditional upon *DEBUG_TRANSFER.
Signed-off-by: Finn Thain
Reviewed-by: Hannes Reinecke
---
drivers/scsi/dtc.c | 18 ++
drivers/scsi/dtc.h | 27 ---
drivers/scsi/pas16.c | 21 +++--
drivers/scsi/pas16.h | 16
drivers/scsi/t128.c | 18 ++
drivers/scsi/t128.h | 16
6 files changed, 19 insertions(+), 97 deletions(-)
Index: linux/drivers/scsi/dtc.c
===
--- linux.orig/drivers/scsi/dtc.c 2016-01-03 16:02:42.0 +1100
+++ linux/drivers/scsi/dtc.c2016-01-03 16:02:47.0 +1100
@@ -205,9 +205,8 @@ static int __init dtc_detect(struct scsi
addr = 0;
} else
for (; !addr && (current_base < NO_BASES);
++current_base) {
-#if (DTCDEBUG & DTCDEBUG_INIT)
- printk(KERN_DEBUG "scsi-dtc : probing address
%08x\n", bases[current_base].address);
-#endif
+ dprintk(NDEBUG_INIT, "dtc: probing address
0x%08x\n",
+ (unsigned
int)bases[current_base].address);
if (bases[current_base].noauto)
continue;
base = ioremap(bases[current_base].address,
0x2000);
@@ -216,18 +215,14 @@ static int __init dtc_detect(struct scsi
for (sig = 0; sig < NO_SIGNATURES; ++sig) {
if (check_signature(base +
signatures[sig].offset, signatures[sig].string,
strlen(signatures[sig].string))) {
addr =
bases[current_base].address;
-#if (DTCDEBUG & DTCDEBUG_INIT)
- printk(KERN_DEBUG "scsi-dtc :
detected board.\n");
-#endif
+ dprintk(NDEBUG_INIT, "dtc:
detected board\n");
goto found;
}
}
iounmap(base);
}
-#if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT)
- printk(KERN_DEBUG "scsi-dtc : base = %08x\n", addr);
-#endif
+ dprintk(NDEBUG_INIT, "dtc: addr = 0x%08x\n", addr);
if (!addr)
break;
@@ -271,9 +266,8 @@ found:
printk(KERN_WARNING "scsi%d : interrupts not used.
Might as well not jumper it.\n", instance->host_no);
instance->irq = NO_IRQ;
#endif
-#if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT)
- printk("scsi%d : irq = %d\n", instance->host_no, instance->irq);
-#endif
+ dprintk(NDEBUG_INIT, "scsi%d : irq = %d\n",
+ instance->host_no, instance->irq);
++current_override;
++count;
Index: linux/drivers/scsi/dtc.h
===
--- linux.orig/drivers/scsi/dtc.h 2016-01-03 16:02:39.0 +1100
+++ linux/drivers/scsi/dtc.h2016-01-03 16:02:47.0 +1100
@@ -10,10 +10,6 @@
#ifndef DTC3280_H
#define DTC3280_H
-#define DTCDEBUG 0
-#define DTCDEBUG_INIT 0x1
-#define DTCDEBUG_TRANSFER 0x2
-
#ifndef CMD_PER_LUN
#define CMD_PER_LUN 2
#endif
@@ -33,31 +29,8 @@
#define DTC_address(reg) (base + DTC_5380_OFFSET + reg)
-#define dbNCR5380_read(reg) \
-(rval=readb(DTC_address(reg)), \
- (((unsigned char) printk("DTC : read register %d at addr %p is: %02x\n"\
-, (reg), DTC_address(reg), rval)), rval ) )
-
-#define dbNCR5380_write(reg, value) do { \
-printk("DTC : write %02x to register %d at address %p\n", \
-(value), (reg), DTC_address(reg)); \
-writeb(value, DTC_address(reg));} while(0)
-
-
-#if !(DTCDEBUG & DTCDEBUG_TRANSFER)
#define NCR5380_read(reg) (readb(DTC_address(reg)))
#define NCR5380_write(reg, value) (writeb(value, DTC_address(reg)))
-#else
-#define NCR5380_read(reg) (readb(DTC_address(reg)))
-#define xNCR5380_read(reg) \
-(((unsigned char) printk("DTC : read register %d at address %p\n"\
-, (reg), DTC_address(reg))), readb(DTC_address(reg)))
-
-#define NCR5380_write(reg, value) do { \
-printk("DTC : write %02x to register %d at address %p\n", \
- (value), (reg), DTC_address(reg)); \
-writeb(value, DTC_address(reg));} while(0)
-#endif
#define NCR5380_intr dtc_intr
#define NCR5380_queue_command dtc_queue_command
Index:
