From owner-p4-projects@FreeBSD.ORG  Tue Nov  7 21:33:06 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CA0DA16A4A7; Tue,  7 Nov 2006 21:33:06 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7838B16A47C
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 21:33:06 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 46C8343D53
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 21:33:06 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7LX6CC059134
	for <perforce@freebsd.org>; Tue, 7 Nov 2006 21:33:06 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7LX5DT059131
	for perforce@freebsd.org; Tue, 7 Nov 2006 21:33:05 GMT
	(envelope-from cognet@freebsd.org)
Date: Tue, 7 Nov 2006 21:33:05 GMT
Message-Id: <200611072133.kA7LX5DT059131@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109479 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Nov 2006 21:33:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=109479

Change 109479 by cognet@cognet on 2006/11/07 21:32:51

	Introduce ixpnpe_start_locked(), to be used from ixpnpe_init(), where
	we already hold the lock.
	Approved by:	mux (mentor)

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 (text+ko) ====

@@ -329,25 +329,34 @@
     return error;
 }
 
-int
-ixpnpe_start(struct ixpnpe_softc *sc)
+static int
+ixpnpe_start_locked(struct ixpnpe_softc *sc)
 {
     int error;
 
-    mtx_lock(&sc->sc_mtx);
     if (!sc->started) {
 	error = npe_cpu_start(sc);
 	if (error == 0)
 	    sc->started = 1;
     } else
 	error = 0;
-    mtx_unlock(&sc->sc_mtx);
 
     DPRINTF(sc->sc_dev, "%s: error %d\n", __func__, error);
     return error;
 }
 
 int
+ixpnpe_start(struct ixpnpe_softc *sc)
+{
+	int ret;
+
+	mtx_lock(&sc->sc_mtx);
+	ret = ixpnpe_start_locked(sc);
+	mtx_unlock(&sc->sc_mtx);
+	return (ret);
+}
+
+int
 ixpnpe_stop(struct ixpnpe_softc *sc)
 {
     int error;
@@ -450,7 +459,7 @@
     error = npe_load_image(sc, imageCodePtr, 1 /*VERIFY*/);
     if (error == 0) {
 	sc->validImage = 1;
-	error = ixpnpe_start(sc);
+	error = ixpnpe_start_locked(sc);
     } else {
 	sc->validImage = 0;
     }