Merge tag 'linux-kselftest-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / gvp11.h

diff --git a/drivers/scsi/gvp11.h b/drivers/scsi/gvp11.h
index e2efdf9601ef98fb0b5490bb7378bab2b6906d2f..852913cde5dd9a5b5bdf43722d76613ef68c12d2 100644 (file)
--- a/drivers/scsi/gvp11.h
+++ b/drivers/scsi/gvp11.h
@@ -11,9 +11,6 @@
 
 #include <linux/types.h>
 
-int gvp11_detect(struct scsi_host_template *);
-int gvp11_release(struct Scsi_Host *);
-
 #ifndef CMD_PER_LUN
 #define CMD_PER_LUN            2
 #endif
@@ -22,15 +19,13 @@ int gvp11_release(struct Scsi_Host *);
 #define CAN_QUEUE              16
 #endif
 
-#ifndef HOSTS_C
-
 /*
  * if the transfer address ANDed with this results in a non-zero
  * result, then we can't use DMA.
  */
 #define GVP11_XFER_MASK                (0xff000001)
 
-typedef struct {
+struct gvp11_scsiregs {
                 unsigned char  pad1[64];
        volatile unsigned short CNTR;
                 unsigned char  pad2[31];
@@ -46,7 +41,7 @@ typedef struct {
        volatile unsigned short SP_DMA;
        volatile unsigned short secret2; /* store 1 here */
        volatile unsigned short secret3; /* store 15 here */
-} gvp11_scsiregs;
+};
 
 /* bits in CNTR */
 #define GVP11_DMAC_BUSY                (1<<0)
@@ -54,6 +49,4 @@ typedef struct {
 #define GVP11_DMAC_INT_ENABLE  (1<<3)
 #define GVP11_DMAC_DIR_WRITE   (1<<4)
 
-#endif /* else def HOSTS_C */
-
 #endif /* GVP11_H */