From owner-svn-src-stable-8@FreeBSD.ORG  Mon May 10 18:51:49 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 716F11065670;
	Mon, 10 May 2010 18:51:49 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FE828FC1A;
	Mon, 10 May 2010 18:51:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4AIpnRq037324;
	Mon, 10 May 2010 18:51:49 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4AIpnqS037322;
	Mon, 10 May 2010 18:51:49 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201005101851.o4AIpnqS037322@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 10 May 2010 18:51:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207867 - stable/8/sys/dev/esp
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 18:51:49 -0000

Author: marius
Date: Mon May 10 18:51:49 2010
New Revision: 207867
URL: http://svn.freebsd.org/changeset/base/207867

Log:
  MFC: r207281
  
  Take advantage of OF_getscsinitid().

Modified:
  stable/8/sys/dev/esp/esp_sbus.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/esp/esp_sbus.c
==============================================================================
--- stable/8/sys/dev/esp/esp_sbus.c	Mon May 10 18:50:28 2010	(r207866)
+++ stable/8/sys/dev/esp/esp_sbus.c	Mon May 10 18:51:49 2010	(r207867)
@@ -466,9 +466,7 @@ espattach(struct esp_softc *esc, const s
 		goto fail_lock;
 	}
 
-	if (OF_getprop(ofw_bus_get_node(esc->sc_dev), "scsi-initiator-id",
-	    &sc->sc_id, sizeof(sc->sc_id)) == -1)
-		sc->sc_id = 7;
+	sc->sc_id = OF_getscsinitid(esc->sc_dev);
 
 #ifdef ESP_SBUS_DEBUG
 	device_printf(esc->sc_dev, "%s: sc_id %d, freq %d\n",