From owner-svn-src-all@FreeBSD.ORG  Thu Jan 20 20:23:03 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBD5E1065670;
	Thu, 20 Jan 2011 20:23:03 +0000 (UTC)
	(envelope-from andreast@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DAE218FC0C;
	Thu, 20 Jan 2011 20:23:03 +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 p0KKN3Af026986;
	Thu, 20 Jan 2011 20:23:03 GMT
	(envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0KKN3k5026984;
	Thu, 20 Jan 2011 20:23:03 GMT
	(envelope-from andreast@svn.freebsd.org)
Message-Id: <201101202023.p0KKN3k5026984@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Thu, 20 Jan 2011 20:23:03 +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: r217659 - head/sys/powerpc/powermac
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 20 Jan 2011 20:23:04 -0000

Author: andreast
Date: Thu Jan 20 20:23:03 2011
New Revision: 217659
URL: http://svn.freebsd.org/changeset/base/217659

Log:
  Remove unused variables. Spotted by a cppcheck
  (devel/cppcheck, http://sourceforge.net/projects/cppcheck) run.
  
  Approved by: nwhitehorn (mentor)

Modified:
  head/sys/powerpc/powermac/cpcht.c

Modified: head/sys/powerpc/powermac/cpcht.c
==============================================================================
--- head/sys/powerpc/powermac/cpcht.c	Thu Jan 20 20:22:19 2011	(r217658)
+++ head/sys/powerpc/powermac/cpcht.c	Thu Jan 20 20:23:03 2011	(r217659)
@@ -475,10 +475,6 @@ cpcht_write_config(device_t dev, u_int b
 static int
 cpcht_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
 {
-	struct	cpcht_softc *sc;
-
-	sc = device_get_softc(dev);
-
 	switch (which) {
 	case PCIB_IVAR_DOMAIN:
 		*result = device_get_unit(dev);
@@ -514,13 +510,12 @@ cpcht_alloc_resource(device_t bus, devic
 	struct			cpcht_softc *sc;
 	struct			resource *rv;
 	struct			rman *rm;
-	int			needactivate, err;
+	int			needactivate;
 
 	needactivate = flags & RF_ACTIVE;
 	flags &= ~RF_ACTIVE;
 
 	sc = device_get_softc(bus);
-	err = 0;
 
 	switch (type) {
 	case SYS_RES_IOPORT:
@@ -569,9 +564,6 @@ cpcht_activate_resource(device_t bus, de
     struct resource *res)
 {
 	void	*p;
-	struct	cpcht_softc *sc;
-
-	sc = device_get_softc(bus);
 
 	if (type == SYS_RES_IRQ)
 		return (bus_activate_resource(bus, type, rid, res));