patch-2.3.27 linux/drivers/scsi/ibmmca.h

Next file: linux/drivers/scsi/ide-scsi.c
Previous file: linux/drivers/scsi/ibmmca.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.26/linux/drivers/scsi/ibmmca.h linux/drivers/scsi/ibmmca.h
@@ -27,11 +27,7 @@
 extern int ibmmca_biosparam (Disk *, kdev_t, int *);
 
 /*structure for /proc filesystem */
-extern struct proc_dir_entry proc_scsi_ibmmca;
 
-#if LINUX_VERSION_CODE >= ibmmca_header_linux_version(2,1,0)
-/* Stuff for Linux >= 2.1.0: */
-/*initialization for Scsi_host_template type (Linux >= 2.1.0) */
 /*
  * 2/8/98
  * Note to maintainer of IBMMCA.  Do not change this initializer back to
@@ -39,7 +35,7 @@
  * about this, but it will break things in the future.
  */
 #define IBMMCA {						      \
-          proc_dir:       &proc_scsi_ibmmca,    /*proc_dir*/          \
+          proc_name:      "ibmmca",             /*proc_name*/         \
 	  proc_info:	  ibmmca_proc_info,     /*proc info fn*/      \
           name:           "IBM SCSI-Subsystem", /*name*/              \
           detect:         ibmmca_detect,        /*detect fn*/         \
@@ -56,34 +52,5 @@
           unchecked_isa_dma: 0,                 /*32-Bit Busmaster */ \
           use_clustering: ENABLE_CLUSTERING     /*use_clustering*/    \
           }
-
-#else
-/* Stuff for Linux < 2.1.0: */
-
-/*initialization for Scsi_host_template type (Linux < 2.1.0) */
-#define IBMMCA {                                      \
-          NULL,                 /*next*/              \
-          NULL,                 /*usage_count*/       \
-          &proc_scsi_ibmmca,    /*proc_dir*/          \
-          ibmmca_proc_info,     /*proc info fn*/      \
-          "IBM SCSI-Subsystem", /*name*/              \
-          ibmmca_detect,        /*detect fn*/         \
-          ibmmca_release,       /*release fn*/        \
-          NULL,                 /*info fn*/           \
-          ibmmca_command,       /*command fn*/        \
-          ibmmca_queuecommand,  /*queuecommand fn*/   \
-          ibmmca_abort,         /*abort fn*/          \
-          ibmmca_reset,         /*reset fn*/          \
-          NULL,                 /*slave_attach fn*/   \
-          ibmmca_biosparam,     /*bios fn*/           \
-          16,                   /*can_queue*/         \
-          7,                    /*set by detect*/     \
-          16,                   /*sg_tablesize*/      \
-          1,                    /*cmd_per_lun*/       \
-          0,                    /*present*/           \
-          0,                    /*unchecked_isa_dma*/ \
-          ENABLE_CLUSTERING     /*use_clustering*/    \
-        }
-#endif /* kernelversion selection */
 
 #endif /* _IBMMCA_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)