summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pas16.h
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2016-01-03 06:05:06 +0100
committerMartin K. Petersen <martin.petersen@oracle.com>2016-01-07 03:42:52 +0100
commit54d8fe4425c9d3fdf8473c1833c6807b61c6e70e (patch)
tree7f6597bc2f7277fa2f04496f814372413177d23d /drivers/scsi/pas16.h
parentncr5380: Remove more pointless macros (diff)
downloadlinux-54d8fe4425c9d3fdf8473c1833c6807b61c6e70e.tar.xz
linux-54d8fe4425c9d3fdf8473c1833c6807b61c6e70e.zip
ncr5380: Remove NCR5380_local_declare and NCR5380_setup macros
The NCR5380_local_declare and NCR5380_setup macros exist to define and initialize a particular local variable, to provide the address of the chip registers needed for the driver's implementation of its NCR5380_read/write register access macros. In cumana_1 and macscsi, these macros generate pointless code like this, struct Scsi_Host *_instance; _instance = instance; In pas16, the use of NCR5380_read/write in pas16_hw_detect() requires that the io_port local variable has been defined and initialized, but the NCR5380_local_declare and NCR5380_setup macros can't be used for that purpose because the Scsi_Host struct has not yet been instantiated. Moreover, these macros were removed from atari_NCR5380.c long ago and now they constitute yet another discrepancy between the two core driver forks. Remove these "optimizations". Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Reviewed-by: Hannes Reinecke <hare@suse.com> Tested-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/pas16.h')
-rw-r--r--drivers/scsi/pas16.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/scsi/pas16.h b/drivers/scsi/pas16.h
index 3634f3fc0325..7247b67fb111 100644
--- a/drivers/scsi/pas16.h
+++ b/drivers/scsi/pas16.h
@@ -103,16 +103,9 @@
#define CAN_QUEUE 32
#endif
-#define NCR5380_implementation_fields \
- volatile unsigned short io_port
+#define NCR5380_implementation_fields /* none */
-#define NCR5380_local_declare() \
- volatile unsigned short io_port
-
-#define NCR5380_setup(instance) \
- io_port = (instance)->io_port
-
-#define PAS16_io_port(reg) ( io_port + pas16_offset[(reg)] )
+#define PAS16_io_port(reg) (instance->io_port + pas16_offset[(reg)])
#define NCR5380_read(reg) ( inb(PAS16_io_port(reg)) )
#define NCR5380_write(reg, value) ( outb((value),PAS16_io_port(reg)) )