Eliminate use of 'migration aids' #define scsipi_<blah> and just use

the real names.

3 files changed, 13 insertions, 20 deletions

diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index d74d51bc4df..b5c6a1574e5 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx.c,v 1.94 2019/05/14 15:19:06 jan Exp $	*/
+/*	$OpenBSD: aic7xxx.c,v 1.95 2020/02/06 17:24:18 krw Exp $	*/
 /*	$NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxx.c,v 1.94 2019/05/14 15:19:06 jan Exp $
+ * $Id: aic7xxx.c,v 1.95 2020/02/06 17:24:18 krw Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
@@ -4333,7 +4333,7 @@ ahc_fini_scbdata(struct ahc_softc *ahc)
 	/*FALLTHROUGH*/
 	case 4:
 		ahc_freedmamem(ahc->parent_dmat,
-		    AHC_SCB_MAX * sizeof(struct scsipi_sense_data),
+		    AHC_SCB_MAX * sizeof(struct scsi_sense_data),
 		    scb_data->sense_dmamap, (caddr_t)scb_data->sense,
 		    &scb_data->sense_seg, scb_data->sense_nseg);
 	/*FALLTHROUGH*/
diff --git a/sys/dev/ic/aic7xxx_cam.h b/sys/dev/ic/aic7xxx_cam.h
index 474ad35900f..e355e17797f 100644
--- a/sys/dev/ic/aic7xxx_cam.h
+++ b/sys/dev/ic/aic7xxx_cam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx_cam.h,v 1.8 2019/09/01 15:03:32 krw Exp $	*/
+/*	$OpenBSD: aic7xxx_cam.h,v 1.9 2020/02/06 17:24:18 krw Exp $	*/
 /*	$NetBSD: aic7xxx_cam.h,v 1.3 2003/04/20 11:17:20 fvdl Exp $	*/
 
 /*
@@ -68,13 +68,6 @@
 #define MSG_SIMPLE_TASK		MSG_SIMPLE_Q_TAG
 #define MSG_ABORT_TASK		MSG_ABORT_TAG
 
-#define scsipi_channel		scsi_link
-#define scsipi_xfer		scsi_xfer
-#define scsipi_adapter		scsi_adapter
-#define scsipi_sense_data	scsi_sense_data
-#define scsipi_sense		scsi_sense
-#define scsipi_periph		scsi_link
-
 #define	callout_reset(timer, timeout, func, arg) do {	\
 	if (!timeout_initialized((timer)))		\
 		timeout_set((timer), (func), (arg));	\
diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h
index 63e98b45576..89944814e72 100644
--- a/sys/dev/ic/aic7xxxvar.h
+++ b/sys/dev/ic/aic7xxxvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxxvar.h,v 1.31 2017/12/12 12:33:36 krw Exp $	*/
+/*	$OpenBSD: aic7xxxvar.h,v 1.32 2020/02/06 17:24:18 krw Exp $	*/
 /*
  * Core definitions and data structures shareable across OS platforms.
  *
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxxvar.h,v 1.31 2017/12/12 12:33:36 krw Exp $
+ * $Id: aic7xxxvar.h,v 1.32 2020/02/06 17:24:18 krw Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $
  */
@@ -592,7 +592,7 @@ struct scb {
 	} links;
 	LIST_ENTRY(scb)		  pending_links;
 
-	struct scsipi_xfer	 *xs;
+	struct scsi_xfer	 *xs;
 	struct ahc_softc	 *ahc_softc;
 	scb_flag		  flags;
 	bus_dmamap_t		  dmamap;
@@ -618,7 +618,7 @@ struct scb_data {
 					 */
 	struct	hardware_scb	*hscbs;	/* Array of hardware SCBs */
 	struct	scb *scbarray;		/* Array of kernel SCBs */
-	struct	scsipi_sense_data *sense; /* Per SCB sense data */
+	struct	scsi_sense_data *sense; /* Per SCB sense data */
 
 	/*
 	 * "Bus" addresses of our data structures.
@@ -935,11 +935,11 @@ typedef void ahc_callback_t (void *);
 struct ahc_softc {
 	struct device		  sc_dev;
 
-	struct scsipi_channel	  sc_channel;
-	struct scsipi_channel	  sc_channel_b;
+	struct scsi_link	  sc_channel;
+	struct scsi_link	  sc_channel_b;
 	struct device *		  sc_child;
 	struct device *		  sc_child_b;
-	struct scsipi_adapter	  sc_adapter;
+	struct scsi_adapter	  sc_adapter;
 
 	bus_space_tag_t           tag;
 	bus_space_handle_t        bsh;
@@ -1247,7 +1247,7 @@ typedef enum {
 int			ahc_search_qinfifo(struct ahc_softc *, int, char,
 			    int, u_int, role_t, uint32_t, ahc_search_action);
 int			ahc_search_untagged_queues(struct ahc_softc *,
-			    struct scsipi_xfer *, int, char, int, uint32_t,
+			    struct scsi_xfer *, int, char, int, uint32_t,
 			    ahc_search_action);
 int			ahc_search_disc_list(struct ahc_softc *, int, char,
 			    int, u_int, int, int, int);
@@ -1313,7 +1313,7 @@ void			ahc_set_tags(struct ahc_softc *ahc,
 #ifdef AHC_TARGET_MODE
 void		ahc_send_lstate_events(struct ahc_softc *,
 		    struct ahc_tmode_lstate *);
-void		ahc_handle_en_lun(struct ahc_softc *, struct scsipi_xfer *);
+void		ahc_handle_en_lun(struct ahc_softc *, struct scsi_xfer *);
 cam_status	ahc_find_tmode_devs(struct ahc_softc *,
 		    struct ahc_tmode_tstate **, struct ahc_tmode_lstate **,
 		    int);