From: Finn Thain <fthain@telegraphics.com.au>
To: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Michael Schmitz <schmitzmic@gmail.com>,
Sam Creasey <sammy@sammy.net>,
linux-scsi@vger.kernel.org, linux-m68k@vger.kernel.org,
Russell King <linux@arm.linux.org.uk>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 15/29] ncr5380: Remove *_RELEASE macros
Date: Thu, 02 Oct 2014 16:56:43 +1000 [thread overview]
Message-ID: <20141002065631.866173651@telegraphics.com.au> (raw)
In-Reply-To: 20141002065628.256592712@telegraphics.com.au
[-- Attachment #1: ncr5380-remove-RELEASE-macros --]
[-- Type: text/plain, Size: 11247 bytes --]
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>
---
drivers/scsi/NCR5380.c | 18 ------------------
drivers/scsi/NCR5380.h | 5 -----
drivers/scsi/arm/cumana_1.c | 2 --
drivers/scsi/arm/oak.c | 2 --
drivers/scsi/atari_NCR5380.c | 4 ----
drivers/scsi/dtc.c | 5 -----
drivers/scsi/dtc.h | 2 --
drivers/scsi/g_NCR5380.c | 2 --
drivers/scsi/g_NCR5380.h | 5 -----
drivers/scsi/mac_scsi.c | 2 --
drivers/scsi/mac_scsi.h | 4 ----
drivers/scsi/pas16.h | 2 --
drivers/scsi/sun3_NCR5380.c | 4 ----
drivers/scsi/sun3_scsi.c | 2 --
drivers/scsi/sun3_scsi.h | 4 ----
drivers/scsi/t128.c | 2 --
drivers/scsi/t128.h | 4 ----
17 files changed, 69 deletions(-)
Index: linux/drivers/scsi/NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/NCR5380.c 2014-10-02 16:56:09.000000000 +1000
+++ linux/drivers/scsi/NCR5380.c 2014-10-02 16:56:11.000000000 +1000
@@ -11,8 +11,6 @@
* drew@colorado.edu
* +1 (303) 666-5836
*
- * DISTRIBUTION RELEASE 6.
- *
* For more information, please consult
*
* NCR 5380 Family
@@ -736,22 +734,6 @@ static int __maybe_unused NCR5380_show_i
hostdata = (struct NCR5380_hostdata *) instance->hostdata;
- SPRINTF("NCR5380 core release=%d. ", NCR5380_PUBLIC_RELEASE);
- if (((struct NCR5380_hostdata *) instance->hostdata)->flags & FLAG_NCR53C400)
- SPRINTF("ncr53c400 release=%d. ", NCR53C400_PUBLIC_RELEASE);
-#ifdef DTC_PUBLIC_RELEASE
- SPRINTF("DTC 3180/3280 release %d", DTC_PUBLIC_RELEASE);
-#endif
-#ifdef T128_PUBLIC_RELEASE
- SPRINTF("T128 release %d", T128_PUBLIC_RELEASE);
-#endif
-#ifdef GENERIC_NCR5380_PUBLIC_RELEASE
- SPRINTF("Generic5380 release %d", GENERIC_NCR5380_PUBLIC_RELEASE);
-#endif
-#ifdef PAS16_PUBLIC_RELEASE
- SPRINTF("PAS16 release=%d", PAS16_PUBLIC_RELEASE);
-#endif
-
#ifdef PSEUDO_DMA
SPRINTF("Highwater I/O busy spin counts: write %d, read %d\n",
hostdata->spin_max_w, hostdata->spin_max_r);
Index: linux/drivers/scsi/atari_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/atari_NCR5380.c 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/atari_NCR5380.c 2014-10-02 16:56:11.000000000 +1000
@@ -11,8 +11,6 @@
* drew@colorado.edu
* +1 (303) 666-5836
*
- * DISTRIBUTION RELEASE 6.
- *
* For more information, please consult
*
* NCR 5380 Family
@@ -739,7 +737,6 @@ static void NCR5380_print_status(struct
hostdata = (struct NCR5380_hostdata *)instance->hostdata;
- printk("\nNCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
local_irq_save(flags);
printk("NCR5380: coroutine is%s running.\n",
main_running ? "" : "n't");
@@ -783,7 +780,6 @@ static int __maybe_unused NCR5380_show_i
hostdata = (struct NCR5380_hostdata *)instance->hostdata;
- seq_printf(m, "NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
local_irq_save(flags);
seq_printf(m, "NCR5380: coroutine is%s running.\n",
main_running ? "" : "n't");
Index: linux/drivers/scsi/sun3_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/sun3_NCR5380.c 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/sun3_NCR5380.c 2014-10-02 16:56:11.000000000 +1000
@@ -13,8 +13,6 @@
* drew@colorado.edu
* +1 (303) 666-5836
*
- * DISTRIBUTION RELEASE 6.
- *
* For more information, please consult
*
* NCR 5380 Family
@@ -685,7 +683,6 @@ static void NCR5380_print_status(struct
hostdata = (struct NCR5380_hostdata *)instance->hostdata;
- printk("\nNCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
local_irq_save(flags);
printk("NCR5380: coroutine is%s running.\n",
main_running ? "" : "n't");
@@ -729,7 +726,6 @@ static int __maybe_unused NCR5380_show_i
hostdata = (struct NCR5380_hostdata *)instance->hostdata;
- seq_printf(m, "NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);
local_irq_save(flags);
seq_printf(m, "NCR5380: coroutine is%s running.\n",
main_running ? "" : "n't");
Index: linux/drivers/scsi/NCR5380.h
===================================================================
--- linux.orig/drivers/scsi/NCR5380.h 2014-10-02 16:56:09.000000000 +1000
+++ linux/drivers/scsi/NCR5380.h 2014-10-02 16:56:11.000000000 +1000
@@ -7,8 +7,6 @@
* drew@colorado.edu
* +1 (303) 666-5836
*
- * DISTRIBUTION RELEASE 7
- *
* For more information, please consult
*
* NCR 5380 Family
@@ -27,9 +25,6 @@
#include <linux/interrupt.h>
#include <scsi/scsi_eh.h>
-#define NCR5380_PUBLIC_RELEASE 7
-#define NCR53C400_PUBLIC_RELEASE 2
-
#define NDEBUG_ARBITRATION 0x1
#define NDEBUG_AUTOSENSE 0x2
#define NDEBUG_DMA 0x4
Index: linux/drivers/scsi/arm/cumana_1.c
===================================================================
--- linux.orig/drivers/scsi/arm/cumana_1.c 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/arm/cumana_1.c 2014-10-02 16:56:11.000000000 +1000
@@ -20,8 +20,6 @@
#define PSEUDO_DMA
-#define CUMANASCSI_PUBLIC_RELEASE 1
-
#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)
#define NCR5380_local_declare() struct Scsi_Host *_instance
#define NCR5380_setup(instance) _instance = instance
Index: linux/drivers/scsi/arm/oak.c
===================================================================
--- linux.orig/drivers/scsi/arm/oak.c 2014-10-02 16:56:09.000000000 +1000
+++ linux/drivers/scsi/arm/oak.c 2014-10-02 16:56:11.000000000 +1000
@@ -18,8 +18,6 @@
#include <scsi/scsi_host.h>
/*#define PSEUDO_DMA*/
-
-#define OAKSCSI_PUBLIC_RELEASE 1
#define DONT_USE_INTR
#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)
Index: linux/drivers/scsi/dtc.c
===================================================================
--- linux.orig/drivers/scsi/dtc.c 2014-10-02 16:56:09.000000000 +1000
+++ linux/drivers/scsi/dtc.c 2014-10-02 16:56:11.000000000 +1000
@@ -17,8 +17,6 @@
* (Unix and Linux consulting and custom programming)
* drew@colorado.edu
* +1 (303) 440-4894
- *
- * DISTRIBUTION RELEASE 1.
*/
/*
@@ -66,9 +64,6 @@
#define AUTOPROBE_IRQ
#include "NCR5380.h"
-
-#define DTC_PUBLIC_RELEASE 2
-
/*
* The DTC3180 & 3280 boards are memory mapped.
*
Index: linux/drivers/scsi/g_NCR5380.h
===================================================================
--- linux.orig/drivers/scsi/g_NCR5380.h 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/g_NCR5380.h 2014-10-02 16:56:11.000000000 +1000
@@ -9,16 +9,11 @@
*
* NCR53C400 extensions (c) 1994,1995,1996, Kevin Lentin
* K.Lentin@cs.monash.edu.au
- *
- * ALPHA RELEASE 1.
*/
#ifndef GENERIC_NCR5380_H
#define GENERIC_NCR5380_H
-
-#define GENERIC_NCR5380_PUBLIC_RELEASE 1
-
#ifdef NCR53C400
#define BIOSPARAM
#define NCR5380_BIOSPARAM generic_NCR5380_biosparam
Index: linux/drivers/scsi/mac_scsi.h
===================================================================
--- linux.orig/drivers/scsi/mac_scsi.h 2014-10-02 16:56:10.000000000 +1000
+++ linux/drivers/scsi/mac_scsi.h 2014-10-02 16:56:11.000000000 +1000
@@ -6,15 +6,11 @@
* (Unix and Linux consulting and custom programming)
* drew@colorado.edu
* +1 (303) 440-4894
- *
- * ALPHA RELEASE 1.
*/
#ifndef MAC_NCR5380_H
#define MAC_NCR5380_H
-#define MACSCSI_PUBLIC_RELEASE 2
-
#ifndef ASM
#include <scsi/scsicam.h>
Index: linux/drivers/scsi/pas16.h
===================================================================
--- linux.orig/drivers/scsi/pas16.h 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/pas16.h 2014-10-02 16:56:11.000000000 +1000
@@ -24,8 +24,6 @@
#ifndef PAS16_H
#define PAS16_H
-#define PAS16_PUBLIC_RELEASE 3
-
#define PDEBUG_INIT 0x1
#define PDEBUG_TRANSFER 0x2
Index: linux/drivers/scsi/sun3_scsi.h
===================================================================
--- linux.orig/drivers/scsi/sun3_scsi.h 2014-10-02 16:56:10.000000000 +1000
+++ linux/drivers/scsi/sun3_scsi.h 2014-10-02 16:56:11.000000000 +1000
@@ -13,15 +13,11 @@
* (Unix and Linux consulting and custom programming)
* drew@colorado.edu
* +1 (303) 440-4894
- *
- * ALPHA RELEASE 1.
*/
#ifndef SUN3_SCSI_H
#define SUN3_SCSI_H
-#define SUN3SCSI_PUBLIC_RELEASE 1
-
/*
* Int: level 2 autovector
* IO: type 1, base 0x00140000, 5 bits phys space: A<4..0>
Index: linux/drivers/scsi/t128.h
===================================================================
--- linux.orig/drivers/scsi/t128.h 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/t128.h 2014-10-02 16:56:11.000000000 +1000
@@ -8,8 +8,6 @@
* drew@colorado.edu
* +1 (303) 440-4894
*
- * DISTRIBUTION RELEASE 3.
- *
* For more information, please consult
*
* Trantor Systems, Ltd.
@@ -25,8 +23,6 @@
#ifndef T128_H
#define T128_H
-#define T128_PUBLIC_RELEASE 3
-
#define TDEBUG 0
#define TDEBUG_INIT 0x1
#define TDEBUG_TRANSFER 0x2
Index: linux/drivers/scsi/dtc.h
===================================================================
--- linux.orig/drivers/scsi/dtc.h 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/dtc.h 2014-10-02 16:56:11.000000000 +1000
@@ -5,8 +5,6 @@
* (Unix and Linux consulting and custom programming)
* drew@colorado.edu
* +1 (303) 440-4894
- *
- * DISTRIBUTION RELEASE 2.
*/
#ifndef DTC3280_H
Index: linux/drivers/scsi/g_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/g_NCR5380.c 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/g_NCR5380.c 2014-10-02 16:56:11.000000000 +1000
@@ -18,8 +18,6 @@
*
* Added ISAPNP support for DTC436 adapters,
* Thomas Sailer, sailer@ife.ee.ethz.ch
- *
- * ALPHA RELEASE 1.
*/
/*
Index: linux/drivers/scsi/mac_scsi.c
===================================================================
--- linux.orig/drivers/scsi/mac_scsi.c 2014-10-02 16:56:10.000000000 +1000
+++ linux/drivers/scsi/mac_scsi.c 2014-10-02 16:56:11.000000000 +1000
@@ -9,8 +9,6 @@
* Generic Generic NCR5380 driver
*
* Copyright 1995, Russell King
- *
- * ALPHA RELEASE 1.
*/
#include <linux/types.h>
Index: linux/drivers/scsi/sun3_scsi.c
===================================================================
--- linux.orig/drivers/scsi/sun3_scsi.c 2014-10-02 16:56:10.000000000 +1000
+++ linux/drivers/scsi/sun3_scsi.c 2014-10-02 16:56:11.000000000 +1000
@@ -20,8 +20,6 @@
* Generic Generic NCR5380 driver
*
* Copyright 1995, Russell King
- *
- * ALPHA RELEASE 1.
*/
#include <linux/types.h>
Index: linux/drivers/scsi/t128.c
===================================================================
--- linux.orig/drivers/scsi/t128.c 2014-10-02 16:56:05.000000000 +1000
+++ linux/drivers/scsi/t128.c 2014-10-02 16:56:11.000000000 +1000
@@ -11,8 +11,6 @@
* drew@colorado.edu
* +1 (303) 440-4894
*
- * DISTRIBUTION RELEASE 3.
- *
* For more information, please consult
*
* Trantor Systems, Ltd.
next prev parent reply other threads:[~2014-10-02 13:04 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-02 6:56 [PATCH 00/29] Fixes, cleanups and modernization for NCR5380 drivers Finn Thain
2014-10-02 6:56 ` [PATCH 01/29] ncr5380: Use printk() not pr_debug() Finn Thain
2014-10-06 9:11 ` Hannes Reinecke
2014-10-02 6:56 ` [PATCH 02/29] ncr5380: Remove unused hostdata fields Finn Thain
2014-10-06 9:12 ` Hannes Reinecke
2014-10-02 6:56 ` [PATCH 03/29] ncr5380: Fix compiler warnings and __setup options Finn Thain
2014-10-06 9:19 ` Hannes Reinecke
2014-10-02 6:56 ` [PATCH 04/29] ncr5380: Remove unused macros Finn Thain
2014-10-06 9:21 ` Hannes Reinecke
2014-10-02 6:56 ` [PATCH 05/29] ncr5380: Remove useless prototypes Finn Thain
2014-10-02 6:56 ` [PATCH 06/29] ncr5380: Remove more " Finn Thain
2014-10-02 6:56 ` [PATCH 07/29] ncr5380: Cleanup TAG_NEXT and TAG_NONE macros Finn Thain
2014-10-03 8:09 ` Geert Uytterhoeven
2014-10-03 10:12 ` Finn Thain
2014-10-06 9:19 ` Hannes Reinecke
2014-10-06 12:26 ` Finn Thain
2014-10-02 6:56 ` [PATCH 08/29] ncr5380: Remove redundant AUTOSENSE macro Finn Thain
2014-10-02 6:56 ` [PATCH 09/29] ncr5380: Remove duplicate comments Finn Thain
2014-10-02 6:56 ` [PATCH 10/29] ncr5380: Fix SCSI_IRQ_NONE bugs Finn Thain
2014-10-03 8:22 ` Geert Uytterhoeven
2014-10-03 10:42 ` Finn Thain
2014-10-02 6:56 ` [PATCH 11/29] ncr5380: Remove NCR5380_STATS Finn Thain
2014-10-02 6:56 ` [PATCH 12/29] ncr5380: Cleanup host info() methods Finn Thain
2014-10-03 8:32 ` Geert Uytterhoeven
2014-10-02 6:56 ` [PATCH 13/29] ncr5380: Move static PDMA spin counters to host data Finn Thain
2014-10-02 6:56 ` [PATCH 14/29] ncr5380: Remove pointless compiler command line override macros Finn Thain
2014-10-02 6:56 ` Finn Thain [this message]
2014-10-02 6:56 ` [PATCH 16/29] ncr5380: Drop legacy scsi.h include Finn Thain
2014-10-02 6:56 ` [PATCH 17/29] dmx3191d: Use IRQ_NONE Finn Thain
2014-10-03 8:41 ` Geert Uytterhoeven
2014-10-02 6:56 ` [PATCH 18/29] mac_scsi: Remove header Finn Thain
2014-10-02 6:56 ` [PATCH 19/29] mac_scsi: Add module option to Kconfig Finn Thain
2014-10-03 8:44 ` Geert Uytterhoeven
2014-10-03 10:49 ` Finn Thain
2014-10-03 11:31 ` Geert Uytterhoeven
2014-10-02 6:56 ` [PATCH 20/29] mac_scsi: Cleanup PDMA code Finn Thain
2014-10-02 6:56 ` [PATCH 21/29] mac_scsi: Convert to platform device Finn Thain
2014-10-03 9:08 ` Geert Uytterhoeven
2014-10-02 6:56 ` [PATCH 22/29] atari_scsi: Fix atari_scsi deadlocks on Falcon Finn Thain
2014-10-03 9:19 ` Geert Uytterhoeven
2014-10-02 6:56 ` [PATCH 23/29] atari_scsi: Convert to platform device Finn Thain
2014-10-03 9:34 ` Geert Uytterhoeven
2014-10-03 11:10 ` Finn Thain
2014-10-04 23:43 ` Michael Schmitz
2014-10-06 7:05 ` Finn Thain
2014-10-06 8:14 ` Michael Schmitz
2014-10-08 11:59 ` Finn Thain
2014-10-06 8:36 ` Geert Uytterhoeven
2014-10-20 7:33 ` Michael Schmitz
2014-10-20 11:22 ` Finn Thain
2014-10-20 18:34 ` Michael Schmitz
2014-10-26 7:37 ` Michael Schmitz
2014-10-27 0:15 ` Finn Thain
2014-10-02 6:56 ` [PATCH 24/29] atari_scsi: Remove header Finn Thain
2014-10-02 6:56 ` [PATCH 25/29] sun3_scsi: Convert to platform device Finn Thain
2014-10-02 6:56 ` [PATCH 26/29] sun3_scsi: Move macro definitions Finn Thain
2014-10-02 6:56 ` [PATCH 27/29] ncr5380: Remove ENABLE_IRQ/DISABLE_IRQ macros Finn Thain
2014-10-02 6:56 ` [PATCH 28/29] atari_NCR5380: Refactor Falcon special cases Finn Thain
2014-10-06 9:28 ` Hannes Reinecke
2014-10-06 11:34 ` Finn Thain
2014-10-06 13:41 ` Ondrej Zary
2014-10-02 6:56 ` [PATCH 29/29] atari_NCR5380: Refactor Falcon locking Finn Thain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141002065631.866173651@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=JBottomley@parallels.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=sammy@sammy.net \
--cc=schmitzmic@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox