svn commit: r255145 - in projects/camlock/sys/cam: . ata scsi

[Alexander Motin]

Author: mav
Date: Mon Sep  2 11:35:55 2013
New Revision: 255145
URL: http://svnweb.freebsd.org/changeset/base/255145

Log:
  Remove some residual SIM references.

Modified:
  projects/camlock/sys/cam/ata/ata_xpt.c
  projects/camlock/sys/cam/cam_xpt.c
  projects/camlock/sys/cam/scsi/scsi_enc_ses.c
  projects/camlock/sys/cam/scsi/scsi_xpt.c

Modified: projects/camlock/sys/cam/ata/ata_xpt.c
==============================================================================
--- projects/camlock/sys/cam/ata/ata_xpt.c	Mon Sep  2 10:44:54 2013	(r255144)
+++ projects/camlock/sys/cam/ata/ata_xpt.c	Mon Sep  2 11:35:55 2013	(r255145)
@@ -1788,10 +1788,8 @@ ata_get_transfer_settings(struct ccb_tra
 	struct	ccb_trans_settings_ata *ata;
 	struct	ccb_trans_settings_scsi *scsi;
 	struct	cam_ed *device;
-	struct	cam_sim *sim;
 
 	device = cts->ccb_h.path->device;
-	sim = cts->ccb_h.path->bus->sim;
 	xpt_action_default((union ccb *)cts);
 
 	if (cts->protocol == PROTO_UNKNOWN ||
@@ -1835,7 +1833,6 @@ ata_set_transfer_settings(struct ccb_tra
 	struct	ccb_pathinq cpi;
 	struct	ccb_trans_settings_ata *ata;
 	struct	ccb_trans_settings_scsi *scsi;
-	struct	cam_sim *sim;
 	struct	ata_params *ident_data;
 	struct	scsi_inquiry_data *inq_data;
 	struct	cam_ed *device;
@@ -1896,7 +1893,6 @@ ata_set_transfer_settings(struct ccb_tra
 		cts->transport_version = device->transport_version;
 	}
 
-	sim = path->bus->sim;
 	ident_data = &device->ident_data;
 	inq_data = &device->inq_data;
 	if (cts->protocol == PROTO_ATA)

Modified: projects/camlock/sys/cam/cam_xpt.c
==============================================================================
--- projects/camlock/sys/cam/cam_xpt.c	Mon Sep  2 10:44:54 2013	(r255144)
+++ projects/camlock/sys/cam/cam_xpt.c	Mon Sep  2 11:35:55 2013	(r255145)
@@ -469,7 +469,6 @@ xptdoioctl(struct cdev *dev, u_long cmd,
 					    inccb->ccb_h.target_lun) !=
 					    CAM_REQ_CMP){
 				error = EINVAL;
-				CAM_SIM_UNLOCK(bus->sim);
 				xpt_free_ccb(ccb);
 				break;
 			}
@@ -503,7 +502,6 @@ xptdoioctl(struct cdev *dev, u_long cmd,
 					    inccb->ccb_h.target_lun) !=
 					    CAM_REQ_CMP){
 				error = EINVAL;
-				CAM_SIM_UNLOCK(bus->sim);
 				break;
 			}
 			/* Ensure all of our fields are correct */

Modified: projects/camlock/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- projects/camlock/sys/cam/scsi/scsi_enc_ses.c	Mon Sep  2 10:44:54 2013	(r255144)
+++ projects/camlock/sys/cam/scsi/scsi_enc_ses.c	Mon Sep  2 11:35:55 2013	(r255145)
@@ -888,7 +888,6 @@ ses_path_iter_devid_callback(enc_softc_t
 	struct device_match_result  *device_match;
 	struct device_match_pattern *device_pattern;
 	ses_path_iter_args_t	    *args;
-	struct cam_sim		    *sim;
 
 	args = (ses_path_iter_args_t *)arg;
 	match_pattern.type = DEV_MATCH_DEVICE;
@@ -914,7 +913,6 @@ ses_path_iter_devid_callback(enc_softc_t
 	cdm.match_buf_len   = sizeof(match_result);
 	cdm.matches         = &match_result;
 
-	sim = xpt_path_sim(cdm.ccb_h.path);
 	xpt_action((union ccb *)&cdm);
 	xpt_free_path(cdm.ccb_h.path);
 

Modified: projects/camlock/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- projects/camlock/sys/cam/scsi/scsi_xpt.c	Mon Sep  2 10:44:54 2013	(r255144)
+++ projects/camlock/sys/cam/scsi/scsi_xpt.c	Mon Sep  2 11:35:55 2013	(r255145)
@@ -2566,7 +2566,6 @@ scsi_set_transfer_settings(struct ccb_tr
 	struct	ccb_trans_settings cur_cts;
 	struct	ccb_trans_settings_scsi *scsi;
 	struct	ccb_trans_settings_scsi *cur_scsi;
-	struct	cam_sim *sim;
 	struct	scsi_inquiry_data *inq_data;
 	struct	cam_ed *device;
 
@@ -2626,8 +2625,6 @@ scsi_set_transfer_settings(struct ccb_tr
 		cts->transport_version = device->transport_version;
 	}
 
-	sim = path->bus->sim;
-
 	/*
 	 * Nothing more of interest to do unless
 	 * this is a device connected via the