From owner-svn-src-all@FreeBSD.ORG  Tue Mar  3 18:54:57 2009
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 9F3B7106564A;
	Tue,  3 Mar 2009 18:54:57 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8DFA88FC15;
	Tue,  3 Mar 2009 18:54:57 +0000 (UTC) (envelope-from imp@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 n23IsvFw018677;
	Tue, 3 Mar 2009 18:54:57 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n23Isvlh018676;
	Tue, 3 Mar 2009 18:54:57 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200903031854.n23Isvlh018676@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 3 Mar 2009 18:54:57 +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: r189317 - head/sys/pci
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: Tue, 03 Mar 2009 18:54:58 -0000

Author: imp
Date: Tue Mar  3 18:54:57 2009
New Revision: 189317
URL: http://svn.freebsd.org/changeset/base/189317

Log:
  The callback takes a void *, not a caddr_t * (sic).
  Except for the bb callback, which takes a caddr_t and not a caddr_t *.

Modified:
  head/sys/pci/viapm.c

Modified: head/sys/pci/viapm.c
==============================================================================
--- head/sys/pci/viapm.c	Tue Mar  3 18:53:47 2009	(r189316)
+++ head/sys/pci/viapm.c	Tue Mar  3 18:54:57 2009	(r189317)
@@ -484,7 +484,7 @@ viapm_pro_detach(device_t dev)
 }
 
 static int
-viabb_callback(device_t dev, int index, caddr_t *data)
+viabb_callback(device_t dev, int index, caddr_t data)
 {
 	return 0;
 }
@@ -641,7 +641,7 @@ viapm_wait(struct viapm_softc *viapm)
 }
 
 static int
-viasmb_callback(device_t dev, int index, caddr_t *data)
+viasmb_callback(device_t dev, int index, void *data)
 {
 	int error = 0;