aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2014-03-17 20:42:22 -0400
committerChristoph Hellwig <hch@lst.de>2014-05-28 06:11:08 -0400
commita469dc2765dca3c07ae356b21e0cd95178249251 (patch)
treee353d7ca36c7da3cfe3435e29cd09b623da9bca2 /drivers/scsi
parent9829e52897359a17169410960e2a9dfcababb83b (diff)
scsi/NCR5380: remove unused macro definitions
Remove the unused (and divergent) debugging macro definitions from the sun3_NCR5380 and atari_NCR5380 drivers. These drivers have been converted to use the common macros in NCR5380.h. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Acked-by: Sam Creasey <sammy@sammy.net> Acked-by: Michael Schmitz <schmitz@debian.org> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/atari_scsi.h93
-rw-r--r--drivers/scsi/sun3_scsi.h181
2 files changed, 0 insertions, 274 deletions
diff --git a/drivers/scsi/atari_scsi.h b/drivers/scsi/atari_scsi.h
index ae559f4ea0b4..3299d91d7336 100644
--- a/drivers/scsi/atari_scsi.h
+++ b/drivers/scsi/atari_scsi.h
@@ -54,99 +54,6 @@
54#define NCR5380_dma_xfer_len(i,cmd,phase) \ 54#define NCR5380_dma_xfer_len(i,cmd,phase) \
55 atari_dma_xfer_len(cmd->SCp.this_residual,cmd,((phase) & SR_IO) ? 0 : 1) 55 atari_dma_xfer_len(cmd->SCp.this_residual,cmd,((phase) & SR_IO) ? 0 : 1)
56 56
57/* Debugging printk definitions:
58 *
59 * ARB -> arbitration
60 * ASEN -> auto-sense
61 * DMA -> DMA
62 * HSH -> PIO handshake
63 * INF -> information transfer
64 * INI -> initialization
65 * INT -> interrupt
66 * LNK -> linked commands
67 * MAIN -> NCR5380_main() control flow
68 * NDAT -> no data-out phase
69 * NWR -> no write commands
70 * PIO -> PIO transfers
71 * PDMA -> pseudo DMA (unused on Atari)
72 * QU -> queues
73 * RSL -> reselections
74 * SEL -> selections
75 * USL -> usleep cpde (unused on Atari)
76 * LBS -> last byte sent (unused on Atari)
77 * RSS -> restarting of selections
78 * EXT -> extended messages
79 * ABRT -> aborting and resetting
80 * TAG -> queue tag handling
81 * MER -> merging of consec. buffers
82 *
83 */
84
85#define dprint(flg, format...) \
86({ \
87 if (NDEBUG & (flg)) \
88 printk(KERN_DEBUG format); \
89})
90
91#define ARB_PRINTK(format, args...) \
92 dprint(NDEBUG_ARBITRATION, format , ## args)
93#define ASEN_PRINTK(format, args...) \
94 dprint(NDEBUG_AUTOSENSE, format , ## args)
95#define DMA_PRINTK(format, args...) \
96 dprint(NDEBUG_DMA, format , ## args)
97#define HSH_PRINTK(format, args...) \
98 dprint(NDEBUG_HANDSHAKE, format , ## args)
99#define INF_PRINTK(format, args...) \
100 dprint(NDEBUG_INFORMATION, format , ## args)
101#define INI_PRINTK(format, args...) \
102 dprint(NDEBUG_INIT, format , ## args)
103#define INT_PRINTK(format, args...) \
104 dprint(NDEBUG_INTR, format , ## args)
105#define LNK_PRINTK(format, args...) \
106 dprint(NDEBUG_LINKED, format , ## args)
107#define MAIN_PRINTK(format, args...) \
108 dprint(NDEBUG_MAIN, format , ## args)
109#define NDAT_PRINTK(format, args...) \
110 dprint(NDEBUG_NO_DATAOUT, format , ## args)
111#define NWR_PRINTK(format, args...) \
112 dprint(NDEBUG_NO_WRITE, format , ## args)
113#define PIO_PRINTK(format, args...) \
114 dprint(NDEBUG_PIO, format , ## args)
115#define PDMA_PRINTK(format, args...) \
116 dprint(NDEBUG_PSEUDO_DMA, format , ## args)
117#define QU_PRINTK(format, args...) \
118 dprint(NDEBUG_QUEUES, format , ## args)
119#define RSL_PRINTK(format, args...) \
120 dprint(NDEBUG_RESELECTION, format , ## args)
121#define SEL_PRINTK(format, args...) \
122 dprint(NDEBUG_SELECTION, format , ## args)
123#define USL_PRINTK(format, args...) \
124 dprint(NDEBUG_USLEEP, format , ## args)
125#define LBS_PRINTK(format, args...) \
126 dprint(NDEBUG_LAST_BYTE_SENT, format , ## args)
127#define RSS_PRINTK(format, args...) \
128 dprint(NDEBUG_RESTART_SELECT, format , ## args)
129#define EXT_PRINTK(format, args...) \
130 dprint(NDEBUG_EXTENDED, format , ## args)
131#define ABRT_PRINTK(format, args...) \
132 dprint(NDEBUG_ABORT, format , ## args)
133#define TAG_PRINTK(format, args...) \
134 dprint(NDEBUG_TAGS, format , ## args)
135#define MER_PRINTK(format, args...) \
136 dprint(NDEBUG_MERGING, format , ## args)
137
138/* conditional macros for NCR5380_print_{,phase,status} */
139
140#define NCR_PRINT(mask) \
141 ((NDEBUG & (mask)) ? NCR5380_print(instance) : (void)0)
142
143#define NCR_PRINT_PHASE(mask) \
144 ((NDEBUG & (mask)) ? NCR5380_print_phase(instance) : (void)0)
145
146#define NCR_PRINT_STATUS(mask) \
147 ((NDEBUG & (mask)) ? NCR5380_print_status(instance) : (void)0)
148
149
150#endif /* ndef ASM */ 57#endif /* ndef ASM */
151#endif /* ATARI_SCSI_H */ 58#endif /* ATARI_SCSI_H */
152 59
diff --git a/drivers/scsi/sun3_scsi.h b/drivers/scsi/sun3_scsi.h
index 563c4b10f918..5d2ca648657f 100644
--- a/drivers/scsi/sun3_scsi.h
+++ b/drivers/scsi/sun3_scsi.h
@@ -182,188 +182,7 @@ struct sun3_udc_regs {
182 182
183#define VME_DATA24 0x3d00 183#define VME_DATA24 0x3d00
184 184
185// debugging printk's, taken from atari_scsi.h
186/* Debugging printk definitions:
187 *
188 * ARB -> arbitration
189 * ASEN -> auto-sense
190 * DMA -> DMA
191 * HSH -> PIO handshake
192 * INF -> information transfer
193 * INI -> initialization
194 * INT -> interrupt
195 * LNK -> linked commands
196 * MAIN -> NCR5380_main() control flow
197 * NDAT -> no data-out phase
198 * NWR -> no write commands
199 * PIO -> PIO transfers
200 * PDMA -> pseudo DMA (unused on Atari)
201 * QU -> queues
202 * RSL -> reselections
203 * SEL -> selections
204 * USL -> usleep cpde (unused on Atari)
205 * LBS -> last byte sent (unused on Atari)
206 * RSS -> restarting of selections
207 * EXT -> extended messages
208 * ABRT -> aborting and resetting
209 * TAG -> queue tag handling
210 * MER -> merging of consec. buffers
211 *
212 */
213
214#include "NCR5380.h" 185#include "NCR5380.h"
215 186
216#if NDEBUG & NDEBUG_ARBITRATION
217#define ARB_PRINTK(format, args...) \
218 printk(KERN_DEBUG format , ## args)
219#else
220#define ARB_PRINTK(format, args...)
221#endif
222#if NDEBUG & NDEBUG_AUTOSENSE
223#define ASEN_PRINTK(format, args...) \
224 printk(KERN_DEBUG format , ## args)
225#else
226#define ASEN_PRINTK(format, args...)
227#endif
228#if NDEBUG & NDEBUG_DMA
229#define DMA_PRINTK(format, args...) \
230 printk(KERN_DEBUG format , ## args)
231#else
232#define DMA_PRINTK(format, args...)
233#endif
234#if NDEBUG & NDEBUG_HANDSHAKE
235#define HSH_PRINTK(format, args...) \
236 printk(KERN_DEBUG format , ## args)
237#else
238#define HSH_PRINTK(format, args...)
239#endif
240#if NDEBUG & NDEBUG_INFORMATION
241#define INF_PRINTK(format, args...) \
242 printk(KERN_DEBUG format , ## args)
243#else
244#define INF_PRINTK(format, args...)
245#endif
246#if NDEBUG & NDEBUG_INIT
247#define INI_PRINTK(format, args...) \
248 printk(KERN_DEBUG format , ## args)
249#else
250#define INI_PRINTK(format, args...)
251#endif
252#if NDEBUG & NDEBUG_INTR
253#define INT_PRINTK(format, args...) \
254 printk(KERN_DEBUG format , ## args)
255#else
256#define INT_PRINTK(format, args...)
257#endif
258#if NDEBUG & NDEBUG_LINKED
259#define LNK_PRINTK(format, args...) \
260 printk(KERN_DEBUG format , ## args)
261#else
262#define LNK_PRINTK(format, args...)
263#endif
264#if NDEBUG & NDEBUG_MAIN
265#define MAIN_PRINTK(format, args...) \
266 printk(KERN_DEBUG format , ## args)
267#else
268#define MAIN_PRINTK(format, args...)
269#endif
270#if NDEBUG & NDEBUG_NO_DATAOUT
271#define NDAT_PRINTK(format, args...) \
272 printk(KERN_DEBUG format , ## args)
273#else
274#define NDAT_PRINTK(format, args...)
275#endif
276#if NDEBUG & NDEBUG_NO_WRITE
277#define NWR_PRINTK(format, args...) \
278 printk(KERN_DEBUG format , ## args)
279#else
280#define NWR_PRINTK(format, args...)
281#endif
282#if NDEBUG & NDEBUG_PIO
283#define PIO_PRINTK(format, args...) \
284 printk(KERN_DEBUG format , ## args)
285#else
286#define PIO_PRINTK(format, args...)
287#endif
288#if NDEBUG & NDEBUG_PSEUDO_DMA
289#define PDMA_PRINTK(format, args...) \
290 printk(KERN_DEBUG format , ## args)
291#else
292#define PDMA_PRINTK(format, args...)
293#endif
294#if NDEBUG & NDEBUG_QUEUES
295#define QU_PRINTK(format, args...) \
296 printk(KERN_DEBUG format , ## args)
297#else
298#define QU_PRINTK(format, args...)
299#endif
300#if NDEBUG & NDEBUG_RESELECTION
301#define RSL_PRINTK(format, args...) \
302 printk(KERN_DEBUG format , ## args)
303#else
304#define RSL_PRINTK(format, args...)
305#endif
306#if NDEBUG & NDEBUG_SELECTION
307#define SEL_PRINTK(format, args...) \
308 printk(KERN_DEBUG format , ## args)
309#else
310#define SEL_PRINTK(format, args...)
311#endif
312#if NDEBUG & NDEBUG_USLEEP
313#define USL_PRINTK(format, args...) \
314 printk(KERN_DEBUG format , ## args)
315#else
316#define USL_PRINTK(format, args...)
317#endif
318#if NDEBUG & NDEBUG_LAST_BYTE_SENT
319#define LBS_PRINTK(format, args...) \
320 printk(KERN_DEBUG format , ## args)
321#else
322#define LBS_PRINTK(format, args...)
323#endif
324#if NDEBUG & NDEBUG_RESTART_SELECT
325#define RSS_PRINTK(format, args...) \
326 printk(KERN_DEBUG format , ## args)
327#else
328#define RSS_PRINTK(format, args...)
329#endif
330#if NDEBUG & NDEBUG_EXTENDED
331#define EXT_PRINTK(format, args...) \
332 printk(KERN_DEBUG format , ## args)
333#else
334#define EXT_PRINTK(format, args...)
335#endif
336#if NDEBUG & NDEBUG_ABORT
337#define ABRT_PRINTK(format, args...) \
338 printk(KERN_DEBUG format , ## args)
339#else
340#define ABRT_PRINTK(format, args...)
341#endif
342#if NDEBUG & NDEBUG_TAGS
343#define TAG_PRINTK(format, args...) \
344 printk(KERN_DEBUG format , ## args)
345#else
346#define TAG_PRINTK(format, args...)
347#endif
348#if NDEBUG & NDEBUG_MERGING
349#define MER_PRINTK(format, args...) \
350 printk(KERN_DEBUG format , ## args)
351#else
352#define MER_PRINTK(format, args...)
353#endif
354
355/* conditional macros for NCR5380_print_{,phase,status} */
356
357#define NCR_PRINT(mask) \
358 ((NDEBUG & (mask)) ? NCR5380_print(instance) : (void)0)
359
360#define NCR_PRINT_PHASE(mask) \
361 ((NDEBUG & (mask)) ? NCR5380_print_phase(instance) : (void)0)
362
363#define NCR_PRINT_STATUS(mask) \
364 ((NDEBUG & (mask)) ? NCR5380_print_status(instance) : (void)0)
365
366
367
368#endif /* SUN3_NCR5380_H */ 187#endif /* SUN3_NCR5380_H */
369 188
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-24 12:15:08 -0500