From owner-svn-src-all@FreeBSD.ORG Thu Jun 6 09:50:42 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id E11B0878;
Thu, 6 Jun 2013 09:50:42 +0000 (UTC) (envelope-from smh@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 D204E1479;
Thu, 6 Jun 2013 09:50:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r569ogdM086238;
Thu, 6 Jun 2013 09:50:42 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r569og78086237;
Thu, 6 Jun 2013 09:50:42 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201306060950.r569og78086237@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Thu, 6 Jun 2013 09:50:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251458 - stable/8/sys/cam/scsi
X-SVN-Group: stable-8
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 "
user" and " projects" \)" <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: Thu, 06 Jun 2013 09:50:43 -0000
Author: smh
Date: Thu Jun 6 09:50:42 2013
New Revision: 251458
URL: http://svnweb.freebsd.org/changeset/base/251458
Log:
MFC r245251:
Remove essentially unused variables from scsi_da probe setups
Modified:
stable/8/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/cam/ (props changed)
Modified: stable/8/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_da.c Thu Jun 6 09:45:22 2013 (r251457)
+++ stable/8/sys/cam/scsi/scsi_da.c Thu Jun 6 09:50:42 2013 (r251458)
@@ -1883,7 +1883,6 @@ out:
}
case DA_STATE_PROBE:
{
- struct ccb_scsiio *csio;
struct scsi_read_capacity_data *rcap;
rcap = (struct scsi_read_capacity_data *)
@@ -1893,8 +1892,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,
@@ -1908,7 +1906,6 @@ out:
}
case DA_STATE_PROBE2:
{
- struct ccb_scsiio *csio;
struct scsi_read_capacity_data_long *rcaplong;
rcaplong = (struct scsi_read_capacity_data_long *)
@@ -1918,8 +1915,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,