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 02/29] ncr5380: Remove unused hostdata fields
Date: Thu, 02 Oct 2014 16:56:30 +1000 [thread overview]
Message-ID: <20141002065628.746182414@telegraphics.com.au> (raw)
In-Reply-To: 20141002065628.256592712@telegraphics.com.au
[-- Attachment #1: ncr5380-remove-unused-hostdata --]
[-- Type: text/plain, Size: 4293 bytes --]
Remove unused fields from hostdata structs declared with the
NCR5380_implementation_fields macro.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
drivers/scsi/dmx3191d.c | 4 ++--
drivers/scsi/mac_scsi.c | 33 ---------------------------------
drivers/scsi/mac_scsi.h | 3 +--
drivers/scsi/sun3_scsi.c | 2 --
drivers/scsi/sun3_scsi.h | 3 +--
5 files changed, 4 insertions(+), 41 deletions(-)
Index: linux/drivers/scsi/dmx3191d.c
===================================================================
--- linux.orig/drivers/scsi/dmx3191d.c 2014-10-02 16:55:29.000000000 +1000
+++ linux/drivers/scsi/dmx3191d.c 2014-10-02 16:55:50.000000000 +1000
@@ -38,8 +38,8 @@
#define NCR5380_read(reg) inb(port + reg)
#define NCR5380_write(reg, value) outb(value, port + reg)
-#define NCR5380_implementation_fields unsigned int port
-#define NCR5380_local_declare() NCR5380_implementation_fields
+#define NCR5380_implementation_fields /* none */
+#define NCR5380_local_declare() unsigned int port
#define NCR5380_setup(instance) port = instance->io_port
/*
Index: linux/drivers/scsi/mac_scsi.c
===================================================================
--- linux.orig/drivers/scsi/mac_scsi.c 2014-10-02 16:55:29.000000000 +1000
+++ linux/drivers/scsi/mac_scsi.c 2014-10-02 16:55:50.000000000 +1000
@@ -93,35 +93,6 @@ static volatile unsigned char *mac_scsi_
* NCR 5380 register access functions
*/
-#if 0
-/* Debug versions */
-#define CTRL(p,v) (*ctrl = (v))
-
-static char macscsi_read(struct Scsi_Host *instance, int reg)
-{
- int iobase = instance->io_port;
- int i;
- int *ctrl = &((struct NCR5380_hostdata *)instance->hostdata)->ctrl;
-
- CTRL(iobase, 0);
- i = in_8(iobase + (reg<<4));
- CTRL(iobase, 0x40);
-
- return i;
-}
-
-static void macscsi_write(struct Scsi_Host *instance, int reg, int value)
-{
- int iobase = instance->io_port;
- int *ctrl = &((struct NCR5380_hostdata *)instance->hostdata)->ctrl;
-
- CTRL(iobase, 0);
- out_8(iobase + (reg<<4), value);
- CTRL(iobase, 0x40);
-}
-#else
-
-/* Fast versions */
static __inline__ char macscsi_read(struct Scsi_Host *instance, int reg)
{
return in_8(instance->io_port + (reg<<4));
@@ -131,8 +102,6 @@ static __inline__ void macscsi_write(str
{
out_8(instance->io_port + (reg<<4), value);
}
-#endif
-
/*
* Function : mac_scsi_setup(char *str)
@@ -279,8 +248,6 @@ int __init macscsi_detect(struct scsi_ho
instance->n_io_port = 255;
- ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
-
if (instance->irq != SCSI_IRQ_NONE)
if (request_irq(instance->irq, NCR5380_intr, 0, "ncr5380", instance)) {
printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n",
Index: linux/drivers/scsi/mac_scsi.h
===================================================================
--- linux.orig/drivers/scsi/mac_scsi.h 2014-10-02 16:55:29.000000000 +1000
+++ linux/drivers/scsi/mac_scsi.h 2014-10-02 16:55:50.000000000 +1000
@@ -47,8 +47,7 @@
#include <scsi/scsicam.h>
-#define NCR5380_implementation_fields \
- int port, ctrl
+#define NCR5380_implementation_fields /* none */
#define NCR5380_local_declare() \
struct Scsi_Host *_instance
Index: linux/drivers/scsi/sun3_scsi.c
===================================================================
--- linux.orig/drivers/scsi/sun3_scsi.c 2014-10-02 16:55:29.000000000 +1000
+++ linux/drivers/scsi/sun3_scsi.c 2014-10-02 16:55:50.000000000 +1000
@@ -313,8 +313,6 @@ static int __init sun3scsi_detect(struct
instance->n_io_port = 32;
- ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
-
if (request_irq(instance->irq, scsi_sun3_intr,
0, "Sun3SCSI-5380", instance)) {
#ifndef REAL_DMA
Index: linux/drivers/scsi/sun3_scsi.h
===================================================================
--- linux.orig/drivers/scsi/sun3_scsi.h 2014-10-02 16:55:29.000000000 +1000
+++ linux/drivers/scsi/sun3_scsi.h 2014-10-02 16:55:50.000000000 +1000
@@ -78,8 +78,7 @@ static int sun3scsi_release (struct Scsi
#define SUN3_SCSI_NAME "Sun3 NCR5380 SCSI"
#endif
-#define NCR5380_implementation_fields \
- int port, ctrl
+#define NCR5380_implementation_fields /* none */
#define NCR5380_local_declare() \
struct Scsi_Host *_instance
next prev parent reply other threads:[~2014-10-02 6:56 UTC|newest]
Thread overview: 70+ 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 ` Finn Thain [this message]
2014-10-06 9:12 ` [PATCH 02/29] ncr5380: Remove unused hostdata fields 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-02 6:56 ` Finn Thain
2014-10-06 9:21 ` Hannes Reinecke
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 ` 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-02 6:56 ` Finn Thain
2014-10-03 8:32 ` Geert Uytterhoeven
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 ` 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 ` [PATCH 15/29] ncr5380: Remove *_RELEASE macros Finn Thain
2014-10-02 6:56 ` Finn Thain
2014-10-02 6:56 ` [PATCH 16/29] ncr5380: Drop legacy scsi.h include Finn Thain
2014-10-02 6:56 ` 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=20141002065628.746182414@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.