diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 9e8511bdbf9..1fed39fb36d 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -951,10 +951,10 @@ ahaaction(struct cam_sim *sim, union ccb *ccb)
 		strlcpy(cpi->hba_vid, "Adaptec", HBA_IDLEN);
 		strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->unit_number = cam_sim_unit(sim);
-                cpi->transport = XPORT_SPI;
-                cpi->transport_version = 2;
-                cpi->protocol = PROTO_SCSI;
-                cpi->protocol_version = SCSI_REV_2;
+		cpi->transport = XPORT_SPI;
+		cpi->transport_version = 2;
+		cpi->protocol = PROTO_SCSI;
+		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index e3e3a7cce9a..b6665009d9a 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -1182,10 +1182,10 @@ ahbaction(struct cam_sim *sim, union ccb *ccb)
 		strlcpy(cpi->hba_vid, "Adaptec", HBA_IDLEN);
 		strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->unit_number = cam_sim_unit(sim);
-                cpi->transport = XPORT_SPI;
-                cpi->transport_version = 2;
-                cpi->protocol = PROTO_SCSI;
-                cpi->protocol_version = SCSI_REV_2;
+		cpi->transport = XPORT_SPI;
+		cpi->transport_version = 2;
+		cpi->protocol = PROTO_SCSI;
+		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 30a7d69a385..c728710989a 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -280,7 +280,7 @@ aic_action(struct cam_sim *sim, union ccb *ccb)
                 cpi->max_lun = 7;
                 cpi->initiator_id = aic->initiator;
                 cpi->bus_id = cam_sim_bus(sim);
-		cpi->base_transfer_speed = 3300;
+                cpi->base_transfer_speed = 3300;
                 strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
                 strlcpy(cpi->hba_vid, "Adaptec", HBA_IDLEN);
                 strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 41d1fdefc3d..a3baca4e9d6 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -3027,10 +3027,10 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb)
 	cpi->max_lun = 0;		/* 'logical drive' channel only */
 	cpi->initiator_id = sc->ciss_cfg->max_logical_supported;
 	strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
-        strlcpy(cpi->hba_vid, "CISS", HBA_IDLEN);
-        strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
-        cpi->unit_number = cam_sim_unit(sim);
-        cpi->bus_id = cam_sim_bus(sim);
+	strlcpy(cpi->hba_vid, "CISS", HBA_IDLEN);
+	strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
+	cpi->unit_number = cam_sim_unit(sim);
+	cpi->bus_id = cam_sim_bus(sim);
 	cpi->base_transfer_speed = 132 * 1024;	/* XXX what to set this to? */
 	cpi->transport = XPORT_SPI;
 	cpi->transport_version = 2;
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index e3330cf11c3..f960dc9ccaf 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -1031,10 +1031,10 @@ dpt_action(struct cam_sim *sim, union ccb *ccb)
 		strlcpy(cpi->hba_vid, "DPT", HBA_IDLEN);
 		strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->unit_number = cam_sim_unit(sim);
-                cpi->transport = XPORT_SPI;
-                cpi->transport_version = 2;
-                cpi->protocol = PROTO_SCSI;
-                cpi->protocol_version = SCSI_REV_2;
+		cpi->transport = XPORT_SPI;
+		cpi->transport_version = 2;
+		cpi->protocol = PROTO_SCSI;
+		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index f0aca6f2922..bc0b59fe2fd 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -2488,10 +2488,10 @@ END_DEBUG
 		strlcpy(cpi->hba_vid, "SBP", HBA_IDLEN);
 		strlcpy(cpi->dev_name, sim->sim_name, DEV_IDLEN);
 		cpi->unit_number = sim->unit_number;
-                cpi->transport = XPORT_SPI;	/* XX should have a FireWire */
-                cpi->transport_version = 2;
-                cpi->protocol = PROTO_SCSI;
-                cpi->protocol_version = SCSI_REV_2;
+		cpi->transport = XPORT_SPI;	/* XX should have a FireWire */
+		cpi->transport_version = 2;
+		cpi->protocol = PROTO_SCSI;
+		cpi->protocol_version = SCSI_REV_2;
 
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 196e4e6ec1d..9e3b3329c5c 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -2110,10 +2110,10 @@ mly_cam_action(struct cam_sim *sim, union ccb *ccb)
 	cpi->max_lun = MLY_MAX_LUNS - 1;
 	cpi->initiator_id = sc->mly_controllerparam->initiator_id;
 	strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
-        strlcpy(cpi->hba_vid, "Mylex", HBA_IDLEN);
-        strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
-        cpi->unit_number = cam_sim_unit(sim);
-        cpi->bus_id = cam_sim_bus(sim);
+	strlcpy(cpi->hba_vid, "Mylex", HBA_IDLEN);
+	strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
+	cpi->unit_number = cam_sim_unit(sim);
+	cpi->bus_id = cam_sim_bus(sim);
 	cpi->base_transfer_speed = 132 * 1024;	/* XXX what to set this to? */
 	cpi->transport = XPORT_SPI;
 	cpi->transport_version = 2;
diff --git a/sys/dev/ncr/ncr.c b/sys/dev/ncr/ncr.c
index ee8a07f7757..b2bfcdba89e 100644
--- a/sys/dev/ncr/ncr.c
+++ b/sys/dev/ncr/ncr.c
@@ -4351,10 +4351,10 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		strlcpy(cpi->hba_vid, "Symbios", HBA_IDLEN);
 		strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->unit_number = cam_sim_unit(sim);
-                cpi->transport = XPORT_SPI;
-                cpi->transport_version = 2;
-                cpi->protocol = PROTO_SCSI;
-                cpi->protocol_version = SCSI_REV_2;
+		cpi->transport = XPORT_SPI;
+		cpi->transport_version = 2;
+		cpi->protocol = PROTO_SCSI;
+		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c
index 47001951287..397a3bc7110 100644
--- a/sys/dev/nvme/nvme_sim.c
+++ b/sys/dev/nvme/nvme_sim.c
@@ -185,10 +185,10 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb)
 		strlcpy(cpi->hba_vid, "NVMe", HBA_IDLEN);
 		strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->unit_number = cam_sim_unit(sim);
-                cpi->transport = XPORT_NVME;		/* XXX XPORT_PCIE ? */
-                cpi->transport_version = 1;		/* XXX Get PCIe spec ? */
-                cpi->protocol = PROTO_NVME;
-                cpi->protocol_version = NVME_REV_1;	/* Groks all 1.x NVMe cards */
+		cpi->transport = XPORT_NVME;		/* XXX XPORT_PCIE ? */
+		cpi->transport_version = 1;		/* XXX Get PCIe spec ? */
+		cpi->protocol = PROTO_NVME;
+		cpi->protocol_version = NVME_REV_1;	/* Groks all 1.x NVMe cards */
 		cpi->xport_specific.nvme.nsid = ns->id;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
diff --git a/sys/dev/twa/tw_osl_cam.c b/sys/dev/twa/tw_osl_cam.c
index 699c0f468ea..75739ec3653 100644
--- a/sys/dev/twa/tw_osl_cam.c
+++ b/sys/dev/twa/tw_osl_cam.c
@@ -427,11 +427,11 @@ twa_action(struct cam_sim *sim, union ccb *ccb)
 		strlcpy(path_inq->sim_vid, "FreeBSD", SIM_IDLEN);
 		strlcpy(path_inq->hba_vid, "3ware", HBA_IDLEN);
 		strlcpy(path_inq->dev_name, cam_sim_name(sim), DEV_IDLEN);
-                path_inq->transport = XPORT_SPI;
-                path_inq->transport_version = 2;
-                path_inq->protocol = PROTO_SCSI;
-                path_inq->protocol_version = SCSI_REV_2;
-                path_inq->maxio = TW_CL_MAX_IO_SIZE;
+		path_inq->transport = XPORT_SPI;
+		path_inq->transport_version = 2;
+		path_inq->protocol = PROTO_SCSI;
+		path_inq->protocol_version = SCSI_REV_2;
+		path_inq->maxio = TW_CL_MAX_IO_SIZE;
 		ccb_h->status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;