From: Finn Thain <fthain@telegraphics.com.au>
To: "James E.J. Bottomley" <JBottomley@parallels.com>,
linux-scsi@vger.kernel.org
Cc: Sam Creasey <sammy@sammy.net>,
Russell King <linux@arm.linux.org.uk>,
Michael Schmitz <schmitz@debian.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-m68k@vger.kernel.org
Subject: [PATCH 02/12] scsi/NCR5380: remove redundant HOSTS_C macro tests
Date: Tue, 18 Mar 2014 11:42:14 +1100 [thread overview]
Message-ID: <20140318004213.222484138@telegraphics.com.au> (raw)
In-Reply-To: 20140318004212.612472697@telegraphics.com.au
[-- Attachment #1: ncr5380-HOSTS_C-macro --]
[-- Type: text/plain, Size: 3356 bytes --]
HOSTS_C is always undefined. There is no hosts.c anymore.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
drivers/scsi/g_NCR5380.h | 3 ---
drivers/scsi/mac_scsi.h | 3 ---
drivers/scsi/pas16.h | 3 ---
drivers/scsi/sun3_scsi.h | 3 ---
drivers/scsi/t128.h | 3 ---
5 files changed, 15 deletions(-)
Index: linux-m68k/drivers/scsi/g_NCR5380.h
===================================================================
--- linux-m68k.orig/drivers/scsi/g_NCR5380.h 2014-03-17 23:49:30.000000000 +1100
+++ linux-m68k/drivers/scsi/g_NCR5380.h 2014-03-18 00:18:30.000000000 +1100
@@ -58,8 +58,6 @@ static const char* generic_NCR5380_info(
#define CAN_QUEUE 16
#endif
-#ifndef HOSTS_C
-
#define __STRVAL(x) #x
#define STRVAL(x) __STRVAL(x)
@@ -131,7 +129,6 @@ static const char* generic_NCR5380_info(
#define BOARD_NCR53C400A 2
#define BOARD_DTC3181E 3
-#endif /* else def HOSTS_C */
#endif /* ndef ASM */
#endif /* GENERIC_NCR5380_H */
Index: linux-m68k/drivers/scsi/mac_scsi.h
===================================================================
--- linux-m68k.orig/drivers/scsi/mac_scsi.h 2014-03-18 00:18:20.000000000 +1100
+++ linux-m68k/drivers/scsi/mac_scsi.h 2014-03-18 00:18:30.000000000 +1100
@@ -51,8 +51,6 @@
#include <scsi/scsicam.h>
-#ifndef HOSTS_C
-
#define NCR5380_implementation_fields \
int port, ctrl
@@ -75,7 +73,6 @@
#define NCR5380_show_info macscsi_show_info
#define NCR5380_write_info macscsi_write_info
-#endif /* ndef HOSTS_C */
#endif /* ndef ASM */
#endif /* MAC_NCR5380_H */
Index: linux-m68k/drivers/scsi/pas16.h
===================================================================
--- linux-m68k.orig/drivers/scsi/pas16.h 2014-03-17 23:49:30.000000000 +1100
+++ linux-m68k/drivers/scsi/pas16.h 2014-03-18 00:18:30.000000000 +1100
@@ -129,8 +129,6 @@ static int pas16_bus_reset(Scsi_Cmnd *);
#define CAN_QUEUE 32
#endif
-#ifndef HOSTS_C
-
#define NCR5380_implementation_fields \
volatile unsigned short io_port
@@ -171,6 +169,5 @@ static int pas16_bus_reset(Scsi_Cmnd *);
#define PAS16_IRQS 0xd4a8
-#endif /* else def HOSTS_C */
#endif /* ndef ASM */
#endif /* PAS16_H */
Index: linux-m68k/drivers/scsi/sun3_scsi.h
===================================================================
--- linux-m68k.orig/drivers/scsi/sun3_scsi.h 2014-03-18 00:18:20.000000000 +1100
+++ linux-m68k/drivers/scsi/sun3_scsi.h 2014-03-18 00:18:30.000000000 +1100
@@ -82,8 +82,6 @@ static int sun3scsi_release (struct Scsi
#define SUN3_SCSI_NAME "Sun3 NCR5380 SCSI"
#endif
-#ifndef HOSTS_C
-
#define NCR5380_implementation_fields \
int port, ctrl
@@ -371,6 +369,5 @@ struct sun3_udc_regs {
-#endif /* ndef HOSTS_C */
#endif /* SUN3_NCR5380_H */
Index: linux-m68k/drivers/scsi/t128.h
===================================================================
--- linux-m68k.orig/drivers/scsi/t128.h 2014-03-17 23:49:30.000000000 +1100
+++ linux-m68k/drivers/scsi/t128.h 2014-03-18 00:18:30.000000000 +1100
@@ -107,8 +107,6 @@ static int t128_bus_reset(struct scsi_cm
#define CAN_QUEUE 32
#endif
-#ifndef HOSTS_C
-
#define NCR5380_implementation_fields \
void __iomem *base
@@ -148,6 +146,5 @@ static int t128_bus_reset(struct scsi_cm
#define T128_IRQS 0xc4a8
-#endif /* else def HOSTS_C */
#endif /* ndef ASM */
#endif /* T128_H */
next prev parent reply other threads:[~2014-03-18 0:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 0:42 [PATCH 00/12] scsi/NCR5380: fix debugging macros and #include structure Finn Thain
2014-03-18 0:42 ` [PATCH 01/12] scsi/NCR5380: remove unused BOARD_NORMAL and BOARD_NCR53C400 Finn Thain
2014-05-28 9:48 ` Christoph Hellwig
2014-03-18 0:42 ` Finn Thain [this message]
2014-05-28 9:49 ` [PATCH 02/12] scsi/NCR5380: remove redundant HOSTS_C macro tests Christoph Hellwig
2014-03-18 0:42 ` [PATCH 03/12] scsi/NCR5380: remove old CVS keywords Finn Thain
2014-05-28 9:49 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 04/12] scsi/NCR5380: use NCR5380_dprint() instead of NCR5380_print() Finn Thain
2014-05-28 9:49 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 05/12] scsi/NCR5380: fix build failures when debugging is enabled Finn Thain
2014-05-28 9:50 ` Christoph Hellwig
2014-05-28 12:09 ` Finn Thain
2014-05-28 12:13 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 06/12] scsi/NCR5380: fix dprintk macro usage and definition Finn Thain
2014-05-28 9:50 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 07/12] scsi/NCR5380: adopt NCR5380_dprint() and NCR5380_dprint_phase() Finn Thain
2014-05-28 9:51 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 08/12] scsi/NCR5380: adopt dprintk() Finn Thain
2014-05-28 9:52 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 09/12] scsi/NCR5380: fix and standardize NDEBUG macros Finn Thain
2014-05-28 9:54 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 10/12] scsi/NCR5380: remove unused macro definitions Finn Thain
2014-05-28 9:54 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 11/12] scsi/NCR5380: reduce depth of sun3_scsi nested includes Finn Thain
2014-05-28 9:55 ` Christoph Hellwig
2014-03-18 0:42 ` [PATCH 12/12] scsi/NCR5380: merge sun3_scsi_vme.c into sun3_scsi.c Finn Thain
2014-05-28 9:55 ` Christoph Hellwig
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=20140318004213.222484138@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=JBottomley@parallels.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=sammy@sammy.net \
--cc=schmitz@debian.org \
/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