aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2014-11-12 00:12:01 -0500
committerChristoph Hellwig <hch@lst.de>2014-11-20 03:11:10 -0500
commit96068e6b4d86a397f50ae401723f315110874e1a (patch)
treebbab76ec5da519d565ba706021c9cf9921335e06 /drivers
parentd572f65fdf78a6dcb55b86ad8684f88830bf2e08 (diff)
ncr5380: Remove *_RELEASE macros
The *_RELEASE macros don't tell me anything. In some cases the version in the macro contradicts the version in the comments. Anyway, the Linux kernel version is sufficient information. Remove these macros to improve readability. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Reviewed-by: Hannes Reinecke <hare@suse.de> Tested-by: Michael Schmitz <schmitzmic@gmail.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/NCR5380.c18
-rw-r--r--drivers/scsi/NCR5380.h5
-rw-r--r--drivers/scsi/arm/cumana_1.c2
-rw-r--r--drivers/scsi/arm/oak.c2
-rw-r--r--drivers/scsi/atari_NCR5380.c4
-rw-r--r--drivers/scsi/dtc.c5
-rw-r--r--drivers/scsi/dtc.h2
-rw-r--r--drivers/scsi/g_NCR5380.c2
-rw-r--r--drivers/scsi/g_NCR5380.h5
-rw-r--r--drivers/scsi/mac_scsi.c2
-rw-r--r--drivers/scsi/mac_scsi.h4
-rw-r--r--drivers/scsi/pas16.h2
-rw-r--r--drivers/scsi/sun3_NCR5380.c4
-rw-r--r--drivers/scsi/sun3_scsi.c2
-rw-r--r--drivers/scsi/sun3_scsi.h4
-rw-r--r--drivers/scsi/t128.c2
-rw-r--r--drivers/scsi/t128.h4
17 files changed, 0 insertions, 69 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 77e8908f644e..12334a08b701 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -11,8 +11,6 @@
11 * drew@colorado.edu 11 * drew@colorado.edu
12 * +1 (303) 666-5836 12 * +1 (303) 666-5836
13 * 13 *
14 * DISTRIBUTION RELEASE 6.
15 *
16 * For more information, please consult 14 * For more information, please consult
17 * 15 *
18 * NCR 5380 Family 16 * NCR 5380 Family
@@ -735,22 +733,6 @@ static int __maybe_unused NCR5380_show_info(struct seq_file *m,
735 733
736 hostdata = (struct NCR5380_hostdata *) instance->hostdata; 734 hostdata = (struct NCR5380_hostdata *) instance->hostdata;
737 735
738 SPRINTF("NCR5380 core release=%d. ", NCR5380_PUBLIC_RELEASE);
739 if (((struct NCR5380_hostdata *) instance->hostdata)->flags & FLAG_NCR53C400)
740 SPRINTF("ncr53c400 release=%d. ", NCR53C400_PUBLIC_RELEASE);
741#ifdef DTC_PUBLIC_RELEASE
742 SPRINTF("DTC 3180/3280 release %d", DTC_PUBLIC_RELEASE);
743#endif
744#ifdef T128_PUBLIC_RELEASE
745 SPRINTF("T128 release %d", T128_PUBLIC_RELEASE);
746#endif
747#ifdef GENERIC_NCR5380_PUBLIC_RELEASE
748 SPRINTF("Generic5380 release %d", GENERIC_NCR5380_PUBLIC_RELEASE);
749#endif
750#ifdef PAS16_PUBLIC_RELEASE
751 SPRINTF("PAS16 release=%d", PAS16_PUBLIC_RELEASE);
752#endif
753
754#ifdef PSEUDO_DMA 736#ifdef PSEUDO_DMA
755 SPRINTF("Highwater I/O busy spin counts: write %d, read %d\n", 737 SPRINTF("Highwater I/O busy spin counts: write %d, read %d\n",
756 hostdata->spin_max_w, hostdata->spin_max_r); 738 hostdata->spin_max_w, hostdata->spin_max_r);
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index 6bd90eef4460..81e9c26184c0 100644
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -7,8 +7,6 @@
7 * drew@colorado.edu 7 * drew@colorado.edu
8 * +1 (303) 666-5836 8 * +1 (303) 666-5836
9 * 9 *
10 * DISTRIBUTION RELEASE 7
11 *
12 * For more information, please consult 10 * For more information, please consult
13 * 11 *
14 * NCR 5380 Family 12 * NCR 5380 Family
@@ -27,9 +25,6 @@
27#include <linux/interrupt.h> 25#include <linux/interrupt.h>
28#include <scsi/scsi_eh.h> 26#include <scsi/scsi_eh.h>
29 27
30#define NCR5380_PUBLIC_RELEASE 7
31#define NCR53C400_PUBLIC_RELEASE 2
32
33#define NDEBUG_ARBITRATION 0x1 28#define NDEBUG_ARBITRATION 0x1
34#define NDEBUG_AUTOSENSE 0x2 29#define NDEBUG_AUTOSENSE 0x2
35#define NDEBUG_DMA 0x4 30#define NDEBUG_DMA 0x4
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index d3b96af3aa5c..154c9fae255b 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -20,8 +20,6 @@
20 20
21#define PSEUDO_DMA 21#define PSEUDO_DMA
22 22
23#define CUMANASCSI_PUBLIC_RELEASE 1
24
25#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata) 23#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)
26#define NCR5380_local_declare() struct Scsi_Host *_instance 24#define NCR5380_local_declare() struct Scsi_Host *_instance
27#define NCR5380_setup(instance) _instance = instance 25#define NCR5380_setup(instance) _instance = instance
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 840a53dc556e..d1a0dc9c39ff 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -18,8 +18,6 @@
18#include <scsi/scsi_host.h> 18#include <scsi/scsi_host.h>
19 19
20/*#define PSEUDO_DMA*/ 20/*#define PSEUDO_DMA*/
21
22#define OAKSCSI_PUBLIC_RELEASE 1
23#define DONT_USE_INTR 21#define DONT_USE_INTR
24 22
25#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata) 23#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 4d903b86adda..31bd81210fc4 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -11,8 +11,6 @@
11 * drew@colorado.edu 11 * drew@colorado.edu
12 * +1 (303) 666-5836 12 * +1 (303) 666-5836
13 * 13 *
14 * DISTRIBUTION RELEASE 6.
15 *
16 * For more information, please consult 14 * For more information, please consult
17 * 15 *
18 * NCR 5380 Family 16 * NCR 5380 Family
@@ -741,7 +739,6 @@ static void NCR5380_print_status(struct Scsi_Host *instance)
741 739
742 hostdata = (struct NCR5380_hostdata *)instance->hostdata; 740 hostdata = (struct NCR5380_hostdata *)instance->hostdata;
743 741
744 printk("\nNCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
745 local_irq_save(flags); 742 local_irq_save(flags);
746 printk("NCR5380: coroutine is%s running.\n", 743 printk("NCR5380: coroutine is%s running.\n",
747 main_running ? "" : "n't"); 744 main_running ? "" : "n't");
@@ -785,7 +782,6 @@ static int __maybe_unused NCR5380_show_info(struct seq_file *m,
785 782
786 hostdata = (struct NCR5380_hostdata *)instance->hostdata; 783 hostdata = (struct NCR5380_hostdata *)instance->hostdata;
787 784
788 seq_printf(m, "NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
789 local_irq_save(flags); 785 local_irq_save(flags);
790 seq_printf(m, "NCR5380: coroutine is%s running.\n", 786 seq_printf(m, "NCR5380: coroutine is%s running.\n",
791 main_running ? "" : "n't"); 787 main_running ? "" : "n't");
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index 62b8de67f65f..072ca426293d 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -17,8 +17,6 @@
17 * (Unix and Linux consulting and custom programming) 17 * (Unix and Linux consulting and custom programming)
18 * drew@colorado.edu 18 * drew@colorado.edu
19 * +1 (303) 440-4894 19 * +1 (303) 440-4894
20 *
21 * DISTRIBUTION RELEASE 1.
22 */ 20 */
23 21
24/* 22/*
@@ -66,9 +64,6 @@
66#define AUTOPROBE_IRQ 64#define AUTOPROBE_IRQ
67#include "NCR5380.h" 65#include "NCR5380.h"
68 66
69
70#define DTC_PUBLIC_RELEASE 2
71
72/* 67/*
73 * The DTC3180 & 3280 boards are memory mapped. 68 * The DTC3180 & 3280 boards are memory mapped.
74 * 69 *
diff --git a/drivers/scsi/dtc.h b/drivers/scsi/dtc.h
index 48e2c399ace6..78a2332e9064 100644
--- a/drivers/scsi/dtc.h
+++ b/drivers/scsi/dtc.h
@@ -5,8 +5,6 @@
5 * (Unix and Linux consulting and custom programming) 5 * (Unix and Linux consulting and custom programming)
6 * drew@colorado.edu 6 * drew@colorado.edu
7 * +1 (303) 440-4894 7 * +1 (303) 440-4894
8 *
9 * DISTRIBUTION RELEASE 2.
10 */ 8 */
11 9
12#ifndef DTC3280_H 10#ifndef DTC3280_H
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 2b8155f1bf94..c158104fd3aa 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -18,8 +18,6 @@
18 * 18 *
19 * Added ISAPNP support for DTC436 adapters, 19 * Added ISAPNP support for DTC436 adapters,
20 * Thomas Sailer, sailer@ife.ee.ethz.ch 20 * Thomas Sailer, sailer@ife.ee.ethz.ch
21 *
22 * ALPHA RELEASE 1.
23 */ 21 */
24 22
25/* 23/*
diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h
index b1c7ae1204d8..bea1a3b9b862 100644
--- a/drivers/scsi/g_NCR5380.h
+++ b/drivers/scsi/g_NCR5380.h
@@ -9,16 +9,11 @@
9 * 9 *
10 * NCR53C400 extensions (c) 1994,1995,1996, Kevin Lentin 10 * NCR53C400 extensions (c) 1994,1995,1996, Kevin Lentin
11 * K.Lentin@cs.monash.edu.au 11 * K.Lentin@cs.monash.edu.au
12 *
13 * ALPHA RELEASE 1.
14 */ 12 */
15 13
16#ifndef GENERIC_NCR5380_H 14#ifndef GENERIC_NCR5380_H
17#define GENERIC_NCR5380_H 15#define GENERIC_NCR5380_H
18 16
19
20#define GENERIC_NCR5380_PUBLIC_RELEASE 1
21
22#ifdef NCR53C400 17#ifdef NCR53C400
23#define BIOSPARAM 18#define BIOSPARAM
24#define NCR5380_BIOSPARAM generic_NCR5380_biosparam 19#define NCR5380_BIOSPARAM generic_NCR5380_biosparam
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index f00c987478ec..54cb1ab2b676 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -9,8 +9,6 @@
9 * Generic Generic NCR5380 driver 9 * Generic Generic NCR5380 driver
10 * 10 *
11 * Copyright 1995, Russell King 11 * Copyright 1995, Russell King
12 *
13 * ALPHA RELEASE 1.
14 */ 12 */
15 13
16#include <linux/types.h> 14#include <linux/types.h>
diff --git a/drivers/scsi/mac_scsi.h b/drivers/scsi/mac_scsi.h
index 4eed4a75160b..601521c4622d 100644
--- a/drivers/scsi/mac_scsi.h
+++ b/drivers/scsi/mac_scsi.h
@@ -6,15 +6,11 @@
6 * (Unix and Linux consulting and custom programming) 6 * (Unix and Linux consulting and custom programming)
7 * drew@colorado.edu 7 * drew@colorado.edu
8 * +1 (303) 440-4894 8 * +1 (303) 440-4894
9 *
10 * ALPHA RELEASE 1.
11 */ 9 */
12 10
13#ifndef MAC_NCR5380_H 11#ifndef MAC_NCR5380_H
14#define MAC_NCR5380_H 12#define MAC_NCR5380_H
15 13
16#define MACSCSI_PUBLIC_RELEASE 2
17
18#ifndef ASM 14#ifndef ASM
19 15
20#include <scsi/scsicam.h> 16#include <scsi/scsicam.h>
diff --git a/drivers/scsi/pas16.h b/drivers/scsi/pas16.h
index bf589850e8ca..c6109c80050b 100644
--- a/drivers/scsi/pas16.h
+++ b/drivers/scsi/pas16.h
@@ -24,8 +24,6 @@
24#ifndef PAS16_H 24#ifndef PAS16_H
25#define PAS16_H 25#define PAS16_H
26 26
27#define PAS16_PUBLIC_RELEASE 3
28
29#define PDEBUG_INIT 0x1 27#define PDEBUG_INIT 0x1
30#define PDEBUG_TRANSFER 0x2 28#define PDEBUG_TRANSFER 0x2
31 29
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 97cd0071c9aa..1999c8e71d9f 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -13,8 +13,6 @@
13 * drew@colorado.edu 13 * drew@colorado.edu
14 * +1 (303) 666-5836 14 * +1 (303) 666-5836
15 * 15 *
16 * DISTRIBUTION RELEASE 6.
17 *
18 * For more information, please consult 16 * For more information, please consult
19 * 17 *
20 * NCR 5380 Family 18 * NCR 5380 Family
@@ -687,7 +685,6 @@ static void NCR5380_print_status(struct Scsi_Host *instance)
687 685
688 hostdata = (struct NCR5380_hostdata *)instance->hostdata; 686 hostdata = (struct NCR5380_hostdata *)instance->hostdata;
689 687
690 printk("\nNCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
691 local_irq_save(flags); 688 local_irq_save(flags);
692 printk("NCR5380: coroutine is%s running.\n", 689 printk("NCR5380: coroutine is%s running.\n",
693 main_running ? "" : "n't"); 690 main_running ? "" : "n't");
@@ -731,7 +728,6 @@ static int __maybe_unused NCR5380_show_info(struct seq_file *m,
731 728
732 hostdata = (struct NCR5380_hostdata *)instance->hostdata; 729 hostdata = (struct NCR5380_hostdata *)instance->hostdata;
733 730
734 seq_printf(m, "NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
735 local_irq_save(flags); 731 local_irq_save(flags);
736 seq_printf(m, "NCR5380: coroutine is%s running.\n", 732 seq_printf(m, "NCR5380: coroutine is%s running.\n",
737 main_running ? "" : "n't"); 733 main_running ? "" : "n't");
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index 12a991b19e58..19e9808be8d8 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -20,8 +20,6 @@
20 * Generic Generic NCR5380 driver 20 * Generic Generic NCR5380 driver
21 * 21 *
22 * Copyright 1995, Russell King 22 * Copyright 1995, Russell King
23 *
24 * ALPHA RELEASE 1.
25 */ 23 */
26 24
27#include <linux/types.h> 25#include <linux/types.h>
diff --git a/drivers/scsi/sun3_scsi.h b/drivers/scsi/sun3_scsi.h
index d616c9539cec..f2f16378f9fa 100644
--- a/drivers/scsi/sun3_scsi.h
+++ b/drivers/scsi/sun3_scsi.h
@@ -13,15 +13,11 @@
13 * (Unix and Linux consulting and custom programming) 13 * (Unix and Linux consulting and custom programming)
14 * drew@colorado.edu 14 * drew@colorado.edu
15 * +1 (303) 440-4894 15 * +1 (303) 440-4894
16 *
17 * ALPHA RELEASE 1.
18 */ 16 */
19 17
20#ifndef SUN3_SCSI_H 18#ifndef SUN3_SCSI_H
21#define SUN3_SCSI_H 19#define SUN3_SCSI_H
22 20
23#define SUN3SCSI_PUBLIC_RELEASE 1
24
25/* 21/*
26 * Int: level 2 autovector 22 * Int: level 2 autovector
27 * IO: type 1, base 0x00140000, 5 bits phys space: A<4..0> 23 * IO: type 1, base 0x00140000, 5 bits phys space: A<4..0>
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 60aff4ed4cbf..69dac7776059 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -11,8 +11,6 @@
11 * drew@colorado.edu 11 * drew@colorado.edu
12 * +1 (303) 440-4894 12 * +1 (303) 440-4894
13 * 13 *
14 * DISTRIBUTION RELEASE 3.
15 *
16 * For more information, please consult 14 * For more information, please consult
17 * 15 *
18 * Trantor Systems, Ltd. 16 * Trantor Systems, Ltd.
diff --git a/drivers/scsi/t128.h b/drivers/scsi/t128.h
index 806dda75820a..2c7371454dfd 100644
--- a/drivers/scsi/t128.h
+++ b/drivers/scsi/t128.h
@@ -8,8 +8,6 @@
8 * drew@colorado.edu 8 * drew@colorado.edu
9 * +1 (303) 440-4894 9 * +1 (303) 440-4894
10 * 10 *
11 * DISTRIBUTION RELEASE 3.
12 *
13 * For more information, please consult 11 * For more information, please consult
14 * 12 *
15 * Trantor Systems, Ltd. 13 * Trantor Systems, Ltd.
@@ -25,8 +23,6 @@
25#ifndef T128_H 23#ifndef T128_H
26#define T128_H 24#define T128_H
27 25
28#define T128_PUBLIC_RELEASE 3
29
30#define TDEBUG 0 26#define TDEBUG 0
31#define TDEBUG_INIT 0x1 27#define TDEBUG_INIT 0x1
32#define TDEBUG_TRANSFER 0x2 28#define TDEBUG_TRANSFER 0x2