From owner-svn-src-head@FreeBSD.ORG  Sat Feb  7 05:32:19 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56AAF1065670;
	Sat,  7 Feb 2009 05:32:19 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 45A438FC14;
	Sat,  7 Feb 2009 05:32:19 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n175WJJ5082068;
	Sat, 7 Feb 2009 05:32:19 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n175WJrp082067;
	Sat, 7 Feb 2009 05:32:19 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200902070532.n175WJrp082067@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sat, 7 Feb 2009 05:32:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188268 - head/sys/dev/cfi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Feb 2009 05:32:19 -0000

Author: sam
Date: Sat Feb  7 05:32:19 2009
New Revision: 188268
URL: http://svn.freebsd.org/changeset/base/188268

Log:
  fix building w/o CFI_ARMEDANDDANGEROUS

Modified:
  head/sys/dev/cfi/cfi_core.c

Modified: head/sys/dev/cfi/cfi_core.c
==============================================================================
--- head/sys/dev/cfi/cfi_core.c	Sat Feb  7 05:03:25 2009	(r188267)
+++ head/sys/dev/cfi/cfi_core.c	Sat Feb  7 05:32:19 2009	(r188268)
@@ -450,11 +450,13 @@ cfi_get16(struct cfi_softc *sc, int off)
 	return v;
 }
 
+#ifdef CFI_ARMEDANDDANGEROUS
 static void
 cfi_put16(struct cfi_softc *sc, int off, uint16_t v)
 {
 	bus_space_write_2(sc->sc_tag, sc->sc_handle, off<<1, v);
 }
+#endif
 
 /*
  * Read the factory-defined 64-bit segment of the PR.
@@ -556,9 +558,8 @@ cfi_intel_set_plr(struct cfi_softc *sc)
 {
 #ifdef CFI_ARMEDANDDANGEROUS
 	register_t intr;
-#endif
 	int error;
-
+#endif
 	if (sc->sc_cmdset != CFI_VEND_INTEL_ECS)
 		return EOPNOTSUPP;
 	KASSERT(sc->sc_width == 2, ("sc_width %d", sc->sc_width));
@@ -572,11 +573,11 @@ cfi_intel_set_plr(struct cfi_softc *sc)
 	intr_restore(intr);
 	error = cfi_wait_ready(sc, CFI_BCS_READ_STATUS, sc->sc_write_timeout);
 	cfi_write(sc, 0, CFI_BCS_READ_ARRAY);
+	return error;
 #else
 	device_printf(sc->sc_dev, "%s: PLR not set, "
 	    "CFI_ARMEDANDDANGEROUS not configured\n", __func__);
-	error = ENXIO;
+	return ENXIO;
 #endif
-	return error;
 }
 #endif /* CFI_SUPPORT_STRATAFLASH */