svn commit: r249154 - stable/9/sys/cam/scsi

Alexander Motin mav at FreeBSD.org
Fri Apr 5 11:45:52 UTC 2013


Author: mav
Date: Fri Apr  5 11:45:52 2013
New Revision: 249154
URL: http://svnweb.freebsd.org/changeset/base/249154

Log:
  MFC r245251 (by smh):
  Removes essentially unused variables from scsi_da probe setups
  
  PR:		kern/169835

Modified:
  stable/9/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/9/sys/cam/scsi/scsi_da.c	Fri Apr  5 11:42:28 2013	(r249153)
+++ stable/9/sys/cam/scsi/scsi_da.c	Fri Apr  5 11:45:52 2013	(r249154)
@@ -2014,7 +2014,6 @@ out:
 	}
 	case DA_STATE_PROBE:
 	{
-		struct ccb_scsiio *csio;
 		struct scsi_read_capacity_data *rcap;
 
 		rcap = (struct scsi_read_capacity_data *)
@@ -2024,8 +2023,7 @@ out:
 			/* da_free_periph??? */
 			break;
 		}
-		csio = &start_ccb->csio;
-		scsi_read_capacity(csio,
+		scsi_read_capacity(&start_ccb->csio,
 				   /*retries*/4,
 				   dadone,
 				   MSG_SIMPLE_Q_TAG,
@@ -2039,7 +2037,6 @@ out:
 	}
 	case DA_STATE_PROBE2:
 	{
-		struct ccb_scsiio *csio;
 		struct scsi_read_capacity_data_long *rcaplong;
 
 		rcaplong = (struct scsi_read_capacity_data_long *)
@@ -2049,8 +2046,7 @@ out:
 			/* da_free_periph??? */
 			break;
 		}
-		csio = &start_ccb->csio;
-		scsi_read_capacity_16(csio,
+		scsi_read_capacity_16(&start_ccb->csio,
 				      /*retries*/ 4,
 				      /*cbfcnp*/ dadone,
 				      /*tag_action*/ MSG_SIMPLE_Q_TAG,


More information about the svn-src-stable-9 mailing list