From owner-svn-src-all@FreeBSD.ORG  Fri Apr  5 11:45:52 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9E2F0F6D;
 Fri,  5 Apr 2013 11:45:52 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8EDE7110;
 Fri,  5 Apr 2013 11:45:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35BjqZK063133;
 Fri, 5 Apr 2013 11:45:52 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35BjqBE063132;
 Fri, 5 Apr 2013 11:45:52 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201304051145.r35BjqBE063132@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 5 Apr 2013 11:45:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r249154 - stable/9/sys/cam/scsi
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Apr 2013 11:45:52 -0000

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,