aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mac_scsi.c
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2014-11-12 00:11:48 -0500
committerChristoph Hellwig <hch@lst.de>2014-11-20 03:11:03 -0500
commitacfc8cad9135444fdad5385cd9f795fab469a699 (patch)
tree5218297eb7f14e03e5b4752b9f969902f5af672d /drivers/scsi/mac_scsi.c
parentd61c5427f652dd89128f1d2b077aebece3c1a884 (diff)
ncr5380: Remove unused hostdata fields
Remove unused fields from hostdata structs declared with the NCR5380_implementation_fields macro. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/mac_scsi.c')
-rw-r--r--drivers/scsi/mac_scsi.c33
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 6a039eb1cbce..dc774959cc20 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -93,35 +93,6 @@ static volatile unsigned char *mac_scsi_nodrq = NULL;
93 * NCR 5380 register access functions 93 * NCR 5380 register access functions
94 */ 94 */
95 95
96#if 0
97/* Debug versions */
98#define CTRL(p,v) (*ctrl = (v))
99
100static char macscsi_read(struct Scsi_Host *instance, int reg)
101{
102 int iobase = instance->io_port;
103 int i;
104 int *ctrl = &((struct NCR5380_hostdata *)instance->hostdata)->ctrl;
105
106 CTRL(iobase, 0);
107 i = in_8(iobase + (reg<<4));
108 CTRL(iobase, 0x40);
109
110 return i;
111}
112
113static void macscsi_write(struct Scsi_Host *instance, int reg, int value)
114{
115 int iobase = instance->io_port;
116 int *ctrl = &((struct NCR5380_hostdata *)instance->hostdata)->ctrl;
117
118 CTRL(iobase, 0);
119 out_8(iobase + (reg<<4), value);
120 CTRL(iobase, 0x40);
121}
122#else
123
124/* Fast versions */
125static __inline__ char macscsi_read(struct Scsi_Host *instance, int reg) 96static __inline__ char macscsi_read(struct Scsi_Host *instance, int reg)
126{ 97{
127 return in_8(instance->io_port + (reg<<4)); 98 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{ 102{
132 out_8(instance->io_port + (reg<<4), value); 103 out_8(instance->io_port + (reg<<4), value);
133} 104}
134#endif
135
136 105
137/* 106/*
138 * Function : mac_scsi_setup(char *str) 107 * Function : mac_scsi_setup(char *str)
@@ -279,8 +248,6 @@ int __init macscsi_detect(struct scsi_host_template * tpnt)
279 248
280 instance->n_io_port = 255; 249 instance->n_io_port = 255;
281 250
282 ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
283
284 if (instance->irq != SCSI_IRQ_NONE) 251 if (instance->irq != SCSI_IRQ_NONE)
285 if (request_irq(instance->irq, NCR5380_intr, 0, "ncr5380", instance)) { 252 if (request_irq(instance->irq, NCR5380_intr, 0, "ncr5380", instance)) {
286 printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n", 253 printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n",