From owner-svn-src-all@FreeBSD.ORG  Wed May 28 14:26:46 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B7BE05DC;
 Wed, 28 May 2014 14:26:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A50652C88;
 Wed, 28 May 2014 14:26:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SEQkpd092448;
 Wed, 28 May 2014 14:26:46 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4SEQk39092447;
 Wed, 28 May 2014 14:26:46 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201405281426.s4SEQk39092447@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 28 May 2014 14:26:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266808 - head/sys/dev/sound/pci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Wed, 28 May 2014 14:26:46 -0000

Author: marius
Date: Wed May 28 14:26:46 2014
New Revision: 266808
URL: http://svnweb.freebsd.org/changeset/base/266808

Log:
  Actually, just merge r233362 and do away with the unnecessary uint8_t
  pointer casting altogether.

Modified:
  head/sys/dev/sound/pci/emu10k1.c

Modified: head/sys/dev/sound/pci/emu10k1.c
==============================================================================
--- head/sys/dev/sound/pci/emu10k1.c	Wed May 28 13:27:14 2014	(r266807)
+++ head/sys/dev/sound/pci/emu10k1.c	Wed May 28 14:26:46 2014	(r266808)
@@ -1378,7 +1378,7 @@ emu_memalloc(struct sc_info *sc, u_int32
 	ofs = 0;
 	for (idx = start; idx < start + blksz; idx++) {
 		mem->bmap[idx >> 3] |= 1 << (idx & 7);
-		tmp = (uintptr_t)((u_int8_t *)(uintptr_t)blk->buf_addr + ofs);
+		tmp = (uint32_t)(blk->buf_addr + ofs);
 #ifdef EMUDEBUG
 		printf("pte[%d] -> %x phys, %x virt\n", idx, tmp,
 		    ((u_int32_t)buf) + ofs);