Commit 9829e528 authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig
Browse files

scsi/NCR5380: fix and standardize NDEBUG macros 



All three NCR5380 core driver implementations share the same NCR5380.h
header file so they need to agree on certain macro definitions.

The flag bit used by the NDEBUG_MERGING macro in atari_NCR5380 and
sun3_NCR5380 collides with the bit used by NDEBUG_LISTS.

Moreover, NDEBUG_ABORT appears in NCR5380.c so it should be defined in
NCR5380.h rather than in each of the many drivers using that core.

An undefined NDEBUG_ABORT macro caused compiler errors and led to dodgy
workarounds in the core driver that can now be removed.
(See commits f566a576 and
185a7a1c.)

Move all of the NDEBUG_ABORT, NDEBUG_TAGS and NDEBUG_MERGING macro
definitions into NCR5380.h where all the other NDEBUG macros live.

Also, incorrect "#ifdef NDEBUG" becomes "#if NDEBUG" to fix the warning:
drivers/scsi/mac_scsi.c: At top level:
drivers/scsi/NCR5380.c:418: warning: 'NCR5380_print' defined but not used
drivers/scsi/NCR5380.c:459: warning: 'NCR5380_print_phase' defined but not used

The debugging code is now enabled when NDEBUG != 0.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarSam Creasey <sammy@sammy.net>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d65e634a

drivers/scsi/NCR5380.c

+0 −7
Original line number Diff line number Diff line
@@ -87,13 +87,6 @@ 
#include <scsi/scsi_dbg.h>

#include <scsi/scsi_transport_spi.h>



#ifndef NDEBUG

#define NDEBUG 0

#endif

#ifndef NDEBUG_ABORT

#define NDEBUG_ABORT 0

#endif



#if (NDEBUG & NDEBUG_LISTS)

#define LIST(x,y) {printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); }

#define REMOVE(w,x,y,z) {printk("LINE:%d   Removing: %p->%p  %p->%p \n", __LINE__, (void*)(w), (void*)(x), (void*)(y), (void*)(z)); if ((x)==(y)) udelay(5); }

drivers/scsi/NCR5380.h

+18 −4
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ 
#define NDEBUG_C400_PREAD	0x100000

#define NDEBUG_C400_PWRITE	0x200000

#define NDEBUG_LISTS		0x400000

#define NDEBUG_ABORT		0x800000

#define NDEBUG_TAGS		0x1000000

#define NDEBUG_MERGING		0x2000000



#define NDEBUG_ANY		0xFFFFFFFFUL
@@ -288,9 +291,24 @@ struct NCR5380_hostdata { 


#ifdef __KERNEL__



#ifndef NDEBUG

#define NDEBUG (0)

#endif



#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) \

	do { if ((NDEBUG) & (flg)) NCR5380_print_phase(arg); } while (0)

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



#if defined(AUTOPROBE_IRQ)

static int NCR5380_probe_irq(struct Scsi_Host *instance, int possible);
@@ -303,10 +321,6 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id); 
#endif

static void NCR5380_main(struct work_struct *work);

static void __maybe_unused NCR5380_print_options(struct Scsi_Host *instance);

#ifdef NDEBUG

static void NCR5380_print_phase(struct Scsi_Host *instance);

static void NCR5380_print(struct Scsi_Host *instance);

#endif

static int NCR5380_abort(Scsi_Cmnd * cmd);

static int NCR5380_bus_reset(Scsi_Cmnd * cmd);

static int NCR5380_queue_command(struct Scsi_Host *, struct scsi_cmnd *);

drivers/scsi/atari_NCR5380.c

+0 −10
Original line number Diff line number Diff line
@@ -626,16 +626,6 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) 
	}

}



#else /* !NDEBUG */



/* dummies... */

static inline void NCR5380_print(struct Scsi_Host *instance)

{

};

static inline void NCR5380_print_phase(struct Scsi_Host *instance)

{

};



#endif



/*

drivers/scsi/atari_scsi.c

+0 −6
Original line number Diff line number Diff line
@@ -67,12 +67,6 @@ 


#include <linux/module.h>



#define NDEBUG (0)



#define NDEBUG_ABORT		0x00100000

#define NDEBUG_TAGS		0x00200000

#define NDEBUG_MERGING		0x00400000



#define AUTOSENSE

/* For the Atari version, use only polled IO or REAL_DMA */

#define	REAL_DMA

drivers/scsi/dtc.c

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
#define PSEUDO_DMA

#define DONT_USE_INTR

#define UNSAFE			/* Leave interrupts enabled during pseudo-dma I/O */

#define xNDEBUG (NDEBUG_INTR+NDEBUG_RESELECTION+\

		 NDEBUG_SELECTION+NDEBUG_ARBITRATION)

#define DMA_WORKS_RIGHT