Skip to content

L
linux
Commit 2f7dba9f authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files
Options

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: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d5f7e65d
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 97 deletions
drivers/scsi/dtc.c
View file @ 2f7dba9f
...@@ -205,9 +205,8 @@ static int __init dtc_detect(struct scsi_host_template * tpnt) ...@@ -205,9 +205,8 @@ static int __init dtc_detect(struct scsi_host_template * tpnt)
addr = 0; addr = 0;
} else } else
for (; !addr && (current_base < NO_BASES); ++current_base) { for (; !addr && (current_base < NO_BASES); ++current_base) {
#if (DTCDEBUG & DTCDEBUG_INIT) dprintk(NDEBUG_INIT, "dtc: probing address 0x%08x\n",
printk(KERN_DEBUG "scsi-dtc : probing address %08x\n", bases[current_base].address); (unsigned int)bases[current_base].address);
#endif
if (bases[current_base].noauto) if (bases[current_base].noauto)
continue; continue;
base = ioremap(bases[current_base].address, 0x2000); base = ioremap(bases[current_base].address, 0x2000);
...@@ -216,18 +215,14 @@ static int __init dtc_detect(struct scsi_host_template * tpnt) ...@@ -216,18 +215,14 @@ static int __init dtc_detect(struct scsi_host_template * tpnt)
for (sig = 0; sig < NO_SIGNATURES; ++sig) { for (sig = 0; sig < NO_SIGNATURES; ++sig) {
if (check_signature(base + signatures[sig].offset, signatures[sig].string, strlen(signatures[sig].string))) { if (check_signature(base + signatures[sig].offset, signatures[sig].string, strlen(signatures[sig].string))) {
addr = bases[current_base].address; addr = bases[current_base].address;
#if (DTCDEBUG & DTCDEBUG_INIT) dprintk(NDEBUG_INIT, "dtc: detected board\n");
printk(KERN_DEBUG "scsi-dtc : detected board.\n");
#endif
goto found; goto found;
} }
} }
iounmap(base); iounmap(base);
} }
#if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT) dprintk(NDEBUG_INIT, "dtc: addr = 0x%08x\n", addr);
printk(KERN_DEBUG "scsi-dtc : base = %08x\n", addr);
#endif
if (!addr) if (!addr)
break; break;
...@@ -271,9 +266,8 @@ static int __init dtc_detect(struct scsi_host_template * tpnt) ...@@ -271,9 +266,8 @@ static int __init dtc_detect(struct scsi_host_template * tpnt)
printk(KERN_WARNING "scsi%d : interrupts not used. Might as well not jumper it.\n", instance->host_no); printk(KERN_WARNING "scsi%d : interrupts not used. Might as well not jumper it.\n", instance->host_no);
instance->irq = NO_IRQ; instance->irq = NO_IRQ;
#endif #endif
#if defined(DTCDEBUG) && (DTCDEBUG & DTCDEBUG_INIT) dprintk(NDEBUG_INIT, "scsi%d : irq = %d\n",
printk("scsi%d : irq = %d\n", instance->host_no, instance->irq); instance->host_no, instance->irq);
#endif
++current_override; ++current_override;
++count; ++count;
......
drivers/scsi/dtc.h
View file @ 2f7dba9f
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
#ifndef DTC3280_H #ifndef DTC3280_H
#define DTC3280_H #define DTC3280_H
#define DTCDEBUG 0
#define DTCDEBUG_INIT 0x1
#define DTCDEBUG_TRANSFER 0x2
#ifndef CMD_PER_LUN #ifndef CMD_PER_LUN
#define CMD_PER_LUN 2 #define CMD_PER_LUN 2
#endif #endif
...@@ -33,31 +29,8 @@ ...@@ -33,31 +29,8 @@
#define DTC_address(reg) (base + DTC_5380_OFFSET + reg) #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_read(reg) (readb(DTC_address(reg)))
#define NCR5380_write(reg, value) (writeb(value, 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_intr dtc_intr
#define NCR5380_queue_command dtc_queue_command #define NCR5380_queue_command dtc_queue_command
......
drivers/scsi/pas16.c
View file @ 2f7dba9f
#define PSEUDO_DMA #define PSEUDO_DMA
#define UNSAFE /* Not unsafe for PAS16 -- use it */ #define UNSAFE /* Not unsafe for PAS16 -- use it */
#define PDEBUG 0
/* /*
* This driver adapted from Drew Eckhardt's Trantor T128 driver * This driver adapted from Drew Eckhardt's Trantor T128 driver
...@@ -377,23 +376,18 @@ static int __init pas16_detect(struct scsi_host_template *tpnt) ...@@ -377,23 +376,18 @@ static int __init pas16_detect(struct scsi_host_template *tpnt)
} }
else else
for (; !io_port && (current_base < NO_BASES); ++current_base) { for (; !io_port && (current_base < NO_BASES); ++current_base) {
#if (PDEBUG & PDEBUG_INIT) dprintk(NDEBUG_INIT, "pas16: probing io_port 0x%04x\n",
printk("scsi-pas16 : probing io_port %04x\n", (unsigned int) bases[current_base].io_port); (unsigned int)bases[current_base].io_port);
#endif
if ( !bases[current_base].noauto && if ( !bases[current_base].noauto &&
pas16_hw_detect( current_base ) ){ pas16_hw_detect( current_base ) ){
io_port = bases[current_base].io_port; io_port = bases[current_base].io_port;
init_board( io_port, default_irqs[ current_base ], 0 ); init_board( io_port, default_irqs[ current_base ], 0 );
#if (PDEBUG & PDEBUG_INIT) dprintk(NDEBUG_INIT, "pas16: detected board\n");
printk("scsi-pas16 : detected board.\n");
#endif
} }
} }
dprintk(NDEBUG_INIT, "pas16: io_port = 0x%04x\n",
#if defined(PDEBUG) && (PDEBUG & PDEBUG_INIT) (unsigned int)io_port);
printk("scsi-pas16 : io_port = %04x\n", (unsigned int) io_port);
#endif
if (!io_port) if (!io_port)
break; break;
...@@ -431,9 +425,8 @@ static int __init pas16_detect(struct scsi_host_template *tpnt) ...@@ -431,9 +425,8 @@ static int __init pas16_detect(struct scsi_host_template *tpnt)
outb( (inb(io_port + IO_CONFIG_3) & 0x0f), io_port + IO_CONFIG_3 ); outb( (inb(io_port + IO_CONFIG_3) & 0x0f), io_port + IO_CONFIG_3 );
} }
#if defined(PDEBUG) && (PDEBUG & PDEBUG_INIT) dprintk(NDEBUG_INIT, "scsi%d : irq = %d\n",
printk("scsi%d : irq = %d\n", instance->host_no, instance->irq); instance->host_no, instance->irq);
#endif
++current_override; ++current_override;
++count; ++count;
......
drivers/scsi/pas16.h
View file @ 2f7dba9f
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
#ifndef PAS16_H #ifndef PAS16_H
#define PAS16_H #define PAS16_H
#define PDEBUG_INIT 0x1
#define PDEBUG_TRANSFER 0x2
#define PAS16_DEFAULT_BASE_1 0x388 #define PAS16_DEFAULT_BASE_1 0x388
#define PAS16_DEFAULT_BASE_2 0x384 #define PAS16_DEFAULT_BASE_2 0x384
#define PAS16_DEFAULT_BASE_3 0x38c #define PAS16_DEFAULT_BASE_3 0x38c
...@@ -120,21 +117,8 @@ ...@@ -120,21 +117,8 @@
#define PAS16_io_port(reg) ( io_port + pas16_offset[(reg)] ) #define PAS16_io_port(reg) ( io_port + pas16_offset[(reg)] )
#if !(PDEBUG & PDEBUG_TRANSFER)
#define NCR5380_read(reg) ( inb(PAS16_io_port(reg)) ) #define NCR5380_read(reg) ( inb(PAS16_io_port(reg)) )
#define NCR5380_write(reg, value) ( outb((value),PAS16_io_port(reg)) ) #define NCR5380_write(reg, value) ( outb((value),PAS16_io_port(reg)) )
#else
#define NCR5380_read(reg) \
(((unsigned char) printk("scsi%d : read register %d at io_port %04x\n"\
, instance->hostno, (reg), PAS16_io_port(reg))), inb( PAS16_io_port(reg)) )
#define NCR5380_write(reg, value) \
(printk("scsi%d : write %02x to register %d at io_port %04x\n", \
instance->hostno, (value), (reg), PAS16_io_port(reg)), \
outb( (value),PAS16_io_port(reg) ) )
#endif
#define NCR5380_intr pas16_intr #define NCR5380_intr pas16_intr
#define do_NCR5380_intr do_pas16_intr #define do_NCR5380_intr do_pas16_intr
......
drivers/scsi/t128.c
View file @ 2f7dba9f
...@@ -182,9 +182,8 @@ static int __init t128_detect(struct scsi_host_template *tpnt) ...@@ -182,9 +182,8 @@ static int __init t128_detect(struct scsi_host_template *tpnt)
base = 0; base = 0;
} else } else
for (; !base && (current_base < NO_BASES); ++current_base) { for (; !base && (current_base < NO_BASES); ++current_base) {
#if (TDEBUG & TDEBUG_INIT) dprintk(NDEBUG_INIT, "t128: probing address 0x%08x\n",
printk("scsi-t128 : probing address %08x\n", bases[current_base].address); bases[current_base].address);
#endif
if (bases[current_base].noauto) if (bases[current_base].noauto)
continue; continue;
p = ioremap(bases[current_base].address, 0x2000); p = ioremap(bases[current_base].address, 0x2000);
...@@ -195,17 +194,13 @@ static int __init t128_detect(struct scsi_host_template *tpnt) ...@@ -195,17 +194,13 @@ static int __init t128_detect(struct scsi_host_template *tpnt)
signatures[sig].string, signatures[sig].string,
strlen(signatures[sig].string))) { strlen(signatures[sig].string))) {
base = bases[current_base].address; base = bases[current_base].address;
#if (TDEBUG & TDEBUG_INIT) dprintk(NDEBUG_INIT, "t128: detected board\n");
printk("scsi-t128 : detected board.\n");
#endif
goto found; goto found;
} }
iounmap(p); iounmap(p);
} }
#if defined(TDEBUG) && (TDEBUG & TDEBUG_INIT) dprintk(NDEBUG_INIT, "t128: base = 0x%08x\n", (unsigned int)base);
printk("scsi-t128 : base = %08x\n", (unsigned int) base);
#endif
if (!base) if (!base)
break; break;
...@@ -242,9 +237,8 @@ static int __init t128_detect(struct scsi_host_template *tpnt) ...@@ -242,9 +237,8 @@ static int __init t128_detect(struct scsi_host_template *tpnt)
printk("scsi%d : please jumper the board for a free IRQ.\n", instance->host_no); printk("scsi%d : please jumper the board for a free IRQ.\n", instance->host_no);
} }
#if defined(TDEBUG) && (TDEBUG & TDEBUG_INIT) dprintk(NDEBUG_INIT, "scsi%d: irq = %d\n",
printk("scsi%d : irq = %d\n", instance->host_no, instance->irq); instance->host_no, instance->irq);
#endif
++current_override; ++current_override;
++count; ++count;
......
drivers/scsi/t128.h
View file @ 2f7dba9f
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#ifndef T128_H #ifndef T128_H
#define T128_H #define T128_H
#define TDEBUG 0
#define TDEBUG_INIT 0x1
#define TDEBUG_TRANSFER 0x2
/* /*
* The trantor boards are memory mapped. They use an NCR5380 or * The trantor boards are memory mapped. They use an NCR5380 or
* equivalent (my sample board had part second sourced from ZILOG). * equivalent (my sample board had part second sourced from ZILOG).
...@@ -92,20 +88,8 @@ ...@@ -92,20 +88,8 @@
#define T128_address(reg) (base + T_5380_OFFSET + ((reg) * 0x20)) #define T128_address(reg) (base + T_5380_OFFSET + ((reg) * 0x20))
#if !(TDEBUG & TDEBUG_TRANSFER)
#define NCR5380_read(reg) readb(T128_address(reg)) #define NCR5380_read(reg) readb(T128_address(reg))
#define NCR5380_write(reg, value) writeb((value),(T128_address(reg))) #define NCR5380_write(reg, value) writeb((value),(T128_address(reg)))
#else
#define NCR5380_read(reg) \
(((unsigned char) printk("scsi%d : read register %d at address %08x\n"\
, instance->hostno, (reg), T128_address(reg))), readb(T128_address(reg)))
#define NCR5380_write(reg, value) { \
printk("scsi%d : write %02x to register %d at address %08x\n", \
instance->hostno, (value), (reg), T128_address(reg)); \
writeb((value), (T128_address(reg))); \
}
#endif
#define NCR5380_intr t128_intr #define NCR5380_intr t128_intr
#define do_NCR5380_intr do_t128_intr #define do_NCR5380_intr do_t128_intr
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7