From owner-svn-src-head@freebsd.org Tue Apr 26 14:47:54 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 779C6B1C6E0; Tue, 26 Apr 2016 14:47:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2E861181A; Tue, 26 Apr 2016 14:47:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QElrA4031623; Tue, 26 Apr 2016 14:47:53 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QElrL8031619; Tue, 26 Apr 2016 14:47:53 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604261447.u3QElrL8031619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 26 Apr 2016 14:47:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298643 - in head/sys/arm: arm at91 freescale/imx nvidia 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.21 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: Tue, 26 Apr 2016 14:47:54 -0000 Author: pfg Date: Tue Apr 26 14:47:52 2016 New Revision: 298643 URL: https://svnweb.freebsd.org/changeset/base/298643 Log: sys/arm: make use of the howmany() macro when available. We have a howmany() macro in the header that is convenient to re-use as it makes things easier to read. Modified: head/sys/arm/arm/pmap-v4.c head/sys/arm/at91/at91_pit.c head/sys/arm/freescale/imx/imx_i2c.c head/sys/arm/nvidia/as3722_regulators.c Modified: head/sys/arm/arm/pmap-v4.c ============================================================================== --- head/sys/arm/arm/pmap-v4.c Tue Apr 26 14:44:49 2016 (r298642) +++ head/sys/arm/arm/pmap-v4.c Tue Apr 26 14:47:52 2016 (r298643) @@ -2285,7 +2285,7 @@ pmap_bootstrap(vm_offset_t firstaddr, st round_page(size * L2_TABLE_SIZE_REAL) / PAGE_SIZE, &pmap_kernel_l2ptp_kva, NULL); - size = (size + (L2_BUCKET_SIZE - 1)) / L2_BUCKET_SIZE; + size = howmany(size, L2_BUCKET_SIZE); pmap_alloc_specials(&virtual_avail, round_page(size * sizeof(struct l2_dtable)) / PAGE_SIZE, &pmap_kernel_l2dtable_kva, NULL); Modified: head/sys/arm/at91/at91_pit.c ============================================================================== --- head/sys/arm/at91/at91_pit.c Tue Apr 26 14:44:49 2016 (r298642) +++ head/sys/arm/at91/at91_pit.c Tue Apr 26 14:47:52 2016 (r298643) @@ -98,7 +98,7 @@ at91_pit_delay(int us) /* Max delay ~= 260s. @ 133Mhz */ pit_freq = at91_master_clock / PIT_PRESCALE; - cnt = ((pit_freq * us) + (mhz -1)) / mhz; + cnt = howmany(pit_freq * us, mhz); cnt = (cnt <= 0) ? 1 : cnt; while (cnt > 0) { Modified: head/sys/arm/freescale/imx/imx_i2c.c ============================================================================== --- head/sys/arm/freescale/imx/imx_i2c.c Tue Apr 26 14:44:49 2016 (r298642) +++ head/sys/arm/freescale/imx/imx_i2c.c Tue Apr 26 14:47:52 2016 (r298643) @@ -388,7 +388,7 @@ i2c_reset(device_t dev, u_char speed, u_ */ ipgfreq = imx_ccm_ipg_hz(); busfreq = IICBUS_GET_FREQUENCY(sc->iicbus, speed); - div = (ipgfreq + busfreq - 1) / busfreq; + div = howmany(ipgfreq, busfreq); for (i = 0; i < nitems(clkdiv_table); i++) { if (clkdiv_table[i].divisor >= div) break; Modified: head/sys/arm/nvidia/as3722_regulators.c ============================================================================== --- head/sys/arm/nvidia/as3722_regulators.c Tue Apr 26 14:44:49 2016 (r298642) +++ head/sys/arm/nvidia/as3722_regulators.c Tue Apr 26 14:47:52 2016 (r298643) @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_AS3722_REG, "AS3722 regulator", "AS3722 power regulator"); -#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) +#define DIV_ROUND_UP(n,d) howmany(n, d) enum as3722_reg_id { AS3722_REG_ID_SD0,