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
Subject: [PATCH v3 18/37] mac_scsi: Remove header
Date: Wed, 12 Nov 2014 16:12:04 +1100 [thread overview]
Message-ID: <20141112051150.745455089@telegraphics.com.au> (raw)
In-Reply-To: 20141112051146.525489687@telegraphics.com.au
[-- Attachment #1: mac_scsi-remove-header --]
[-- Type: text/plain, Size: 3150 bytes --]
The #defines in mac_scsi.h are intended to influence subsequent #includes in
mac_scsi.c. IMHO, that's too convoluted.
Remove mac_scsi.h by moving those macro definitions to mac_scsi.c,
consistent with other NCR5380 drivers.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/mac_scsi.c | 21 ++++++++++++++++++++-
drivers/scsi/mac_scsi.h | 42 ------------------------------------------
2 files changed, 20 insertions(+), 43 deletions(-)
Index: linux/drivers/scsi/mac_scsi.c
===================================================================
--- linux.orig/drivers/scsi/mac_scsi.c 2014-11-12 16:11:16.000000000 +1100
+++ linux/drivers/scsi/mac_scsi.c 2014-11-12 16:11:20.000000000 +1100
@@ -31,10 +31,29 @@
#include <asm/mac_via.h>
#include <scsi/scsi_host.h>
-#include "mac_scsi.h"
+
+/* Definitions for the core NCR5380 driver. */
#define PSEUDO_DMA
+#define NCR5380_implementation_fields /* none */
+#define NCR5380_local_declare() struct Scsi_Host *_instance
+#define NCR5380_setup(instance) _instance = instance
+
+#define NCR5380_read(reg) macscsi_read(_instance, reg)
+#define NCR5380_write(reg, value) macscsi_write(_instance, reg, value)
+
+#define NCR5380_pread macscsi_pread
+#define NCR5380_pwrite macscsi_pwrite
+
+#define NCR5380_intr macscsi_intr
+#define NCR5380_queue_command macscsi_queue_command
+#define NCR5380_abort macscsi_abort
+#define NCR5380_bus_reset macscsi_bus_reset
+#define NCR5380_info macscsi_info
+#define NCR5380_show_info macscsi_show_info
+#define NCR5380_write_info macscsi_write_info
+
#include "NCR5380.h"
#define RESET_BOOT
Index: linux/drivers/scsi/mac_scsi.h
===================================================================
--- linux.orig/drivers/scsi/mac_scsi.h 2014-11-12 16:11:13.000000000 +1100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * Cumana Generic NCR5380 driver defines
- *
- * Copyright 1993, Drew Eckhardt
- * Visionary Computing
- * (Unix and Linux consulting and custom programming)
- * drew@colorado.edu
- * +1 (303) 440-4894
- */
-
-#ifndef MAC_NCR5380_H
-#define MAC_NCR5380_H
-
-#ifndef ASM
-
-#include <scsi/scsicam.h>
-
-#define NCR5380_implementation_fields /* none */
-
-#define NCR5380_local_declare() \
- struct Scsi_Host *_instance
-
-#define NCR5380_setup(instance) \
- _instance = instance
-
-#define NCR5380_read(reg) macscsi_read(_instance, reg)
-#define NCR5380_write(reg, value) macscsi_write(_instance, reg, value)
-
-#define NCR5380_pread macscsi_pread
-#define NCR5380_pwrite macscsi_pwrite
-
-#define NCR5380_intr macscsi_intr
-#define NCR5380_queue_command macscsi_queue_command
-#define NCR5380_abort macscsi_abort
-#define NCR5380_bus_reset macscsi_bus_reset
-#define NCR5380_info macscsi_info
-#define NCR5380_show_info macscsi_show_info
-#define NCR5380_write_info macscsi_write_info
-
-#endif /* ndef ASM */
-#endif /* MAC_NCR5380_H */
-
next prev parent reply other threads:[~2014-11-12 5:12 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-12 5:11 [PATCH v3 00/37] Fixes, cleanups and modernization for NCR5380 drivers Finn Thain
2014-11-12 5:11 ` [PATCH v3 01/37] ncr5380: Use printk() not pr_debug() Finn Thain
2014-11-12 5:11 ` [PATCH v3 02/37] ncr5380: Remove unused hostdata fields Finn Thain
2014-11-12 5:11 ` [PATCH v3 03/37] ncr5380: Fix compiler warnings and __setup options Finn Thain
2014-11-12 5:11 ` [PATCH v3 04/37] ncr5380: Remove unused macros Finn Thain
2014-11-12 5:11 ` [PATCH v3 05/37] ncr5380: Remove useless prototypes Finn Thain
2014-11-12 5:11 ` [PATCH v3 06/37] ncr5380: Remove more " Finn Thain
2014-11-12 5:11 ` [PATCH v3 07/37] ncr5380: Cleanup TAG_NEXT and TAG_NONE macros Finn Thain
2014-11-12 5:11 ` [PATCH v3 08/37] ncr5380: Remove redundant AUTOSENSE macro Finn Thain
2014-11-12 5:11 ` [PATCH v3 09/37] ncr5380: Remove duplicate comments Finn Thain
2014-11-12 5:11 ` [PATCH v3 10/37] ncr5380: Fix SCSI_IRQ_NONE bugs Finn Thain
2014-11-12 5:11 ` [PATCH v3 11/37] ncr5380: Remove NCR5380_STATS Finn Thain
2014-11-12 5:11 ` [PATCH v3 12/37] ncr5380: Cleanup host info() methods Finn Thain
2014-11-12 5:11 ` [PATCH v3 13/37] ncr5380: Move static PDMA spin counters to host data Finn Thain
2014-11-12 5:12 ` [PATCH v3 14/37] ncr5380: Remove pointless compiler command line override macros Finn Thain
2014-11-12 5:12 ` [PATCH v3 15/37] ncr5380: Remove *_RELEASE macros Finn Thain
2014-11-12 5:12 ` [PATCH v3 16/37] ncr5380: Drop legacy scsi.h include Finn Thain
2014-11-12 5:12 ` [PATCH v3 17/37] dmx3191d: Use NO_IRQ Finn Thain
2014-11-12 5:12 ` Finn Thain [this message]
2014-11-12 5:12 ` [PATCH v3 19/37] mac_scsi: Add module option to Kconfig Finn Thain
2014-11-12 5:12 ` [PATCH v3 20/37] mac_scsi: Cleanup PDMA code Finn Thain
2014-11-12 5:12 ` [PATCH v3 21/37] mac_scsi: Convert to platform device Finn Thain
2014-11-12 5:12 ` [PATCH v3 22/37] atari_scsi: Fix atari_scsi deadlocks on Falcon Finn Thain
2014-11-12 5:12 ` [PATCH v3 23/37] atari_scsi: Convert to platform device Finn Thain
2014-11-12 5:12 ` [PATCH v3 24/37] atari_scsi: Remove header Finn Thain
2014-11-12 5:12 ` [PATCH v3 25/37] sun3_scsi: Convert to platform device Finn Thain
2014-11-12 9:17 ` Geert Uytterhoeven
2014-11-12 11:20 ` Finn Thain
2014-11-13 1:21 ` [PATCH v4 " Finn Thain
2014-11-12 5:12 ` [PATCH v3 26/37] sun3_scsi: Move macro definitions Finn Thain
2014-11-12 5:12 ` [PATCH v3 27/37] ncr5380: Remove ENABLE_IRQ/DISABLE_IRQ macros Finn Thain
2014-11-12 5:12 ` [PATCH v3 28/37] atari_NCR5380: Refactor Falcon special cases Finn Thain
2014-11-12 5:12 ` [PATCH v3 29/37] atari_NCR5380: Refactor Falcon locking Finn Thain
2014-11-12 5:12 ` [PATCH v3 30/37] atari_NCR5380: Merge from sun3_NCR5380.c Finn Thain
2014-11-12 5:12 ` [PATCH v3 31/37] sun3_scsi: Adopt atari_NCR5380 core driver and remove sun3_NCR5380.c Finn Thain
2014-11-12 5:12 ` [PATCH v3 32/37] atari_NCR5380: Merge from NCR5380.c Finn Thain
2014-11-12 5:12 ` [PATCH v3 33/37] atari_NCR5380: Introduce FLAG_TAGGED_QUEUING Finn Thain
2014-11-12 5:12 ` [PATCH v3 34/37] atari_NCR5380: Move static TagAlloc array to host data Finn Thain
2014-11-12 5:12 ` [PATCH v3 35/37] atari_NCR5380: Move static co-routine variables " Finn Thain
2014-11-12 5:12 ` [PATCH v3 36/37] atari_NCR5380: Remove RESET_RUN_DONE macro Finn Thain
2014-11-12 5:12 ` [PATCH v3 37/37] atari_NCR5380: Fix "transfered" typo Finn Thain
2014-11-20 15:56 ` [PATCH v3 00/37] Fixes, cleanups and modernization for NCR5380 drivers Christoph Hellwig
2014-11-21 4:21 ` 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=20141112051150.745455089@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=JBottomley@parallels.com \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--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