Commit acfc8cad authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig

ncr5380: Remove unused hostdata fields

Remove unused fields from hostdata structs declared with the
NCR5380_implementation_fields macro.
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d61c5427
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
#define NCR5380_read(reg) inb(port + reg) #define NCR5380_read(reg) inb(port + reg)
#define NCR5380_write(reg, value) outb(value, port + reg) #define NCR5380_write(reg, value) outb(value, port + reg)
#define NCR5380_implementation_fields unsigned int port #define NCR5380_implementation_fields /* none */
#define NCR5380_local_declare() NCR5380_implementation_fields #define NCR5380_local_declare() unsigned int port
#define NCR5380_setup(instance) port = instance->io_port #define NCR5380_setup(instance) port = instance->io_port
/* /*
......
...@@ -93,35 +93,6 @@ static volatile unsigned char *mac_scsi_nodrq = NULL; ...@@ -93,35 +93,6 @@ static volatile unsigned char *mac_scsi_nodrq = NULL;
* NCR 5380 register access functions * 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) static __inline__ char macscsi_read(struct Scsi_Host *instance, int reg)
{ {
return in_8(instance->io_port + (reg<<4)); return in_8(instance->io_port + (reg<<4));
...@@ -131,8 +102,6 @@ static __inline__ void macscsi_write(struct Scsi_Host *instance, int reg, int va ...@@ -131,8 +102,6 @@ static __inline__ void macscsi_write(struct Scsi_Host *instance, int reg, int va
{ {
out_8(instance->io_port + (reg<<4), value); out_8(instance->io_port + (reg<<4), value);
} }
#endif
/* /*
* Function : mac_scsi_setup(char *str) * Function : mac_scsi_setup(char *str)
...@@ -279,8 +248,6 @@ int __init macscsi_detect(struct scsi_host_template * tpnt) ...@@ -279,8 +248,6 @@ int __init macscsi_detect(struct scsi_host_template * tpnt)
instance->n_io_port = 255; instance->n_io_port = 255;
((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
if (instance->irq != SCSI_IRQ_NONE) if (instance->irq != SCSI_IRQ_NONE)
if (request_irq(instance->irq, NCR5380_intr, 0, "ncr5380", instance)) { if (request_irq(instance->irq, NCR5380_intr, 0, "ncr5380", instance)) {
printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n", printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n",
......
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#define NCR5380_implementation_fields \ #define NCR5380_implementation_fields /* none */
int port, ctrl
#define NCR5380_local_declare() \ #define NCR5380_local_declare() \
struct Scsi_Host *_instance struct Scsi_Host *_instance
......
...@@ -313,8 +313,6 @@ static int __init sun3scsi_detect(struct scsi_host_template *tpnt) ...@@ -313,8 +313,6 @@ static int __init sun3scsi_detect(struct scsi_host_template *tpnt)
instance->n_io_port = 32; instance->n_io_port = 32;
((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
if (request_irq(instance->irq, scsi_sun3_intr, if (request_irq(instance->irq, scsi_sun3_intr,
0, "Sun3SCSI-5380", instance)) { 0, "Sun3SCSI-5380", instance)) {
#ifndef REAL_DMA #ifndef REAL_DMA
......
...@@ -78,8 +78,7 @@ static int sun3scsi_release (struct Scsi_Host *); ...@@ -78,8 +78,7 @@ static int sun3scsi_release (struct Scsi_Host *);
#define SUN3_SCSI_NAME "Sun3 NCR5380 SCSI" #define SUN3_SCSI_NAME "Sun3 NCR5380 SCSI"
#endif #endif
#define NCR5380_implementation_fields \ #define NCR5380_implementation_fields /* none */
int port, ctrl
#define NCR5380_local_declare() \ #define NCR5380_local_declare() \
struct Scsi_Host *_instance struct Scsi_Host *_instance
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment