From owner-svn-src-head@FreeBSD.ORG Sat Nov 15 02:58:17 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E56A8A50; Sat, 15 Nov 2014 02:58:17 +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 D25AB868; Sat, 15 Nov 2014 02:58:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAF2wHbw020187; Sat, 15 Nov 2014 02:58:17 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAF2wH20020186; Sat, 15 Nov 2014 02:58:17 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201411150258.sAF2wH20020186@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sat, 15 Nov 2014 02:58:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274536 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Nov 2014 02:58:18 -0000 Author: ian Date: Sat Nov 15 02:58:17 2014 New Revision: 274536 URL: https://svnweb.freebsd.org/changeset/base/274536 Log: Use the standard powerof2() macro from param.h instead of a local one. Pointed out by: jhb@ Modified: head/sys/arm/arm/busdma_machdep-v6.c Modified: head/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- head/sys/arm/arm/busdma_machdep-v6.c Sat Nov 15 01:18:49 2014 (r274535) +++ head/sys/arm/arm/busdma_machdep-v6.c Sat Nov 15 02:58:17 2014 (r274536) @@ -64,8 +64,6 @@ __FBSDID("$FreeBSD$"); #include #include -#define IS_POWER_OF_2(val) (((val) & ((val) - 1)) == 0) - #define MAX_BPAGES 64 #define MAX_DMA_SEGMENTS 4096 #define BUS_DMA_EXCL_BOUNCE BUS_DMA_BUS2 @@ -469,11 +467,11 @@ bus_dma_tag_create(bus_dma_tag_t parent, #endif /* Basic sanity checking. */ - KASSERT(boundary == 0 || IS_POWER_OF_2(boundary), + KASSERT(boundary == 0 || powerof2(boundary), ("dma tag boundary %lu, must be a power of 2", boundary)); KASSERT(boundary == 0 || boundary >= maxsegsz, ("dma tag boundary %lu is < maxsegsz %lu\n", boundary, maxsegsz)); - KASSERT(alignment != 0 && IS_POWER_OF_2(alignment), + KASSERT(alignment != 0 && powerof2(alignment), ("dma tag alignment %lu, must be non-zero power of 2", alignment)); KASSERT(maxsegsz != 0, ("dma tag maxsegsz must not be zero"));