Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / NCR5380.h

diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index 51a3567a6fb2a36a3eb44fbf94edf5536e333fe4..d78f0957d8653535eda0f01f2af55f82a75a1a3c 100644 (file)
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -81,11 +81,7 @@
 #define ICR_ASSERT_ATN         0x02    /* rw Set to assert ATN */
 #define ICR_ASSERT_DATA                0x01    /* rw SCSI_DATA_REG is asserted */
 
-#ifdef DIFFERENTIAL
-#define ICR_BASE               ICR_DIFF_ENABLE
-#else
 #define ICR_BASE               0
-#endif
 
 #define MODE_REG               2
 /*
@@ -102,11 +98,7 @@
 #define MR_DMA_MODE            0x02    /* rw DMA / pseudo DMA mode */
 #define MR_ARBITRATE           0x01    /* rw start arbitration */
 
-#ifdef PARITY
-#define MR_BASE                        MR_ENABLE_PAR_CHECK
-#else
 #define MR_BASE                        0
-#endif
 
 #define TARGET_COMMAND_REG     3
 #define TCR_LAST_BYTE_SENT     0x80    /* ro DMA done */
@@ -174,11 +166,7 @@
 #define CSR_SCSI_BUF_RDY       0x02    /* ro  SCSI buffer read */
 #define CSR_GATED_53C80_IRQ    0x01    /* ro  Last block xferred */
 
-#if 0
-#define CSR_BASE CSR_SCSI_BUFF_INTR | CSR_53C80_INTR
-#else
 #define CSR_BASE CSR_53C80_INTR
-#endif
 
 /* Note : PHASE_* macros are based on the values of the STATUS register */
 #define PHASE_MASK     (SR_MSG | SR_CD | SR_IO)
@@ -234,11 +222,9 @@ struct NCR5380_hostdata {
        unsigned char id_higher_mask;           /* All bits above id_mask */
        unsigned char last_message;             /* Last Message Out */
        unsigned long region_size;              /* Size of address/port range */
-       char info[256];
+       char info[168];                         /* Host banner message */
 };
 
-#ifdef __KERNEL__
-
 struct NCR5380_cmd {
        struct list_head list;
 };
@@ -331,5 +317,4 @@ static inline int NCR5380_dma_residual_none(struct NCR5380_hostdata *hostdata)
        return 0;
 }
 
-#endif                         /* __KERNEL__ */
 #endif                         /* NCR5380_H */