svn commit: r207868 - stable/7/sys/dev/esp

[Marius Strobl]

Author: marius
Date: Mon May 10 18:52:00 2010
New Revision: 207868
URL: http://svn.freebsd.org/changeset/base/207868

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

Modified:
  stable/7/sys/dev/esp/esp_sbus.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/esp/esp_sbus.c
==============================================================================
--- stable/7/sys/dev/esp/esp_sbus.c	Mon May 10 18:51:49 2010	(r207867)
+++ stable/7/sys/dev/esp/esp_sbus.c	Mon May 10 18:52:00 2010	(r207868)
@@ -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",