1 files changed, 4 insertions, 100 deletions

diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h
index 3a264a408216..2456090bb241 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.h
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h
@@ -48,12 +48,6 @@
  *  They may be defined in platform specific headers, if they 
  *  are useful.
  *
- *    SYM_OPT_HANDLE_DIR_UNKNOWN
- *        When this option is set, the SCRIPTS used by the driver 
- *        are able to handle SCSI transfers with direction not 
- *        supplied by user.
- *        (set for Linux-2.0.X)
- *
  *    SYM_OPT_HANDLE_DEVICE_QUEUEING
  *        When this option is set, the driver will use a queue per 
  *        device and handle QUEUE FULL status requeuing internally.
@@ -64,7 +58,6 @@
  *        (set for Linux)
  */
 #if 0
-#define SYM_OPT_HANDLE_DIR_UNKNOWN
 #define SYM_OPT_HANDLE_DEVICE_QUEUEING
 #define SYM_OPT_LIMIT_COMMAND_REORDERING
 #endif
@@ -416,19 +409,6 @@ struct sym_tcb {
         struct sym_lcb **lunmp;         /* Other LCBs [1..MAX_LUN]      */
 #endif
 
-        /*
-         *  Bitmap that tells about LUNs that succeeded at least 
-         *  1 IO and therefore assumed to be a real device.
-         *  Avoid useless allocation of the LCB structure.
-         */
-        u32     lun_map[(SYM_CONF_MAX_LUN+31)/32];
-
-        /*
-         *  Bitmap that tells about LUNs that haven't yet an LCB 
-         *  allocated (not discovered or LCB allocation failed).
-         */
-        u32     busy0_map[(SYM_CONF_MAX_LUN+31)/32];
-
 #ifdef  SYM_HAVE_STCB
         /*
          *  O/S specific data structure.
@@ -454,8 +434,10 @@ struct sym_tcb {
          *  Other user settable limits and options.
          *  These limits are read from the NVRAM if present.
          */
-        u_char  usrflags;
-        u_short usrtags;
+        unsigned char   usrflags;
+        unsigned char   usr_period;
+        unsigned char   usr_width;
+        unsigned short  usrtags;
         struct scsi_target *starget;
 };
 
@@ -672,9 +654,6 @@ struct sym_ccbh {
          */
         u32     savep;          /* Jump address to saved data pointer   */
         u32     lastp;          /* SCRIPTS address at end of data       */
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        u32     wlastp;
-#endif
 
         /*
          *  Status fields.
@@ -804,9 +783,6 @@ struct sym_ccb {
         SYM_QUEHEAD link_ccbq;  /* Link to free/busy CCB queue  */
         u32     startp;         /* Initial data pointer         */
         u32     goalp;          /* Expected last data pointer   */
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        u32     wgoalp;
-#endif
         int     ext_sg;         /* Extreme data pointer, used   */
         int     ext_ofs;        /*  to calculate the residual.  */
 #ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
@@ -821,12 +797,6 @@ struct sym_ccb {
 
 #define CCB_BA(cp,lbl)  cpu_to_scr(cp->ccb_ba + offsetof(struct sym_ccb, lbl))
 
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-#define sym_goalp(cp) ((cp->host_flags & HF_DATA_IN) ? cp->goalp : cp->wgoalp)
-#else
-#define sym_goalp(cp) (cp->goalp)
-#endif
-
 typedef struct device *m_pool_ident_t;
 
 /*
@@ -1077,7 +1047,6 @@ char *sym_driver_name(void);
 void sym_print_xerr(struct scsi_cmnd *cmd, int x_status);
 int sym_reset_scsi_bus(struct sym_hcb *np, int enab_int);
 struct sym_chip *sym_lookup_chip_table(u_short device_id, u_char revision);
-void sym_put_start_queue(struct sym_hcb *np, struct sym_ccb *cp);
 #ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
 void sym_start_next_ccbs(struct sym_hcb *np, struct sym_lcb *lp, int maxn);
 #endif
@@ -1136,71 +1105,6 @@ bad:
 #endif
 
 /*
- *  Set up data pointers used by SCRIPTS.
- *  Called from O/S specific code.
- */
-static inline void sym_setup_data_pointers(struct sym_hcb *np,
-                struct sym_ccb *cp, int dir)
-{
-        u32 lastp, goalp;
-
-        /*
-         *  No segments means no data.
-         */
-        if (!cp->segments)
-                dir = DMA_NONE;
-
-        /*
-         *  Set the data pointer.
-         */
-        switch(dir) {
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        case DMA_BIDIRECTIONAL:
-#endif
-        case DMA_TO_DEVICE:
-                goalp = SCRIPTA_BA(np, data_out2) + 8;
-                lastp = goalp - 8 - (cp->segments * (2*4));
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-                cp->wgoalp = cpu_to_scr(goalp);
-                if (dir != DMA_BIDIRECTIONAL)
-                        break;
-                cp->phys.head.wlastp = cpu_to_scr(lastp);
-                /* fall through */
-#else
-                break;
-#endif
-        case DMA_FROM_DEVICE:
-                cp->host_flags |= HF_DATA_IN;
-                goalp = SCRIPTA_BA(np, data_in2) + 8;
-                lastp = goalp - 8 - (cp->segments * (2*4));
-                break;
-        case DMA_NONE:
-        default:
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-                cp->host_flags |= HF_DATA_IN;
-#endif
-                lastp = goalp = SCRIPTB_BA(np, no_data);
-                break;
-        }
-
-        /*
-         *  Set all pointers values needed by SCRIPTS.
-         */
-        cp->phys.head.lastp = cpu_to_scr(lastp);
-        cp->phys.head.savep = cpu_to_scr(lastp);
-        cp->startp          = cp->phys.head.savep;
-        cp->goalp           = cpu_to_scr(goalp);
-
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        /*
-         *  If direction is unknown, start at data_io.
-         */
-        if (dir == DMA_BIDIRECTIONAL)
-                cp->phys.head.savep = cpu_to_scr(SCRIPTB_BA(np, data_io));
-#endif
-}
-
-/*
  *  MEMORY ALLOCATOR.
  */