From owner-svn-src-all@freebsd.org Tue Apr 19 22:07:38 2016 Return-Path: Delivered-To: svn-src-all@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 3C42BB13DF1; Tue, 19 Apr 2016 22:07:38 +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 16E471A0E; Tue, 19 Apr 2016 22:07:38 +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 u3JM7bZ2066987; Tue, 19 Apr 2016 22:07:37 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3JM7aeT066982; Tue, 19 Apr 2016 22:07:36 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604192207.u3JM7aeT066982@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 19 Apr 2016 22:07:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298300 - in head/sys/dev/usb: input serial 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.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2016 22:07:38 -0000 Author: pfg Date: Tue Apr 19 22:07:36 2016 New Revision: 298300 URL: https://svnweb.freebsd.org/changeset/base/298300 Log: dev/usb: use our nitems() macro when param.h is available. Reviewed by: hselasky Modified: head/sys/dev/usb/input/ukbd.c head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/serial/uchcom.c head/sys/dev/usb/serial/umcs.c head/sys/dev/usb/serial/uplcom.c Modified: head/sys/dev/usb/input/ukbd.c ============================================================================== --- head/sys/dev/usb/input/ukbd.c Tue Apr 19 21:06:39 2016 (r298299) +++ head/sys/dev/usb/input/ukbd.c Tue Apr 19 22:07:36 2016 (r298300) @@ -2087,7 +2087,7 @@ ukbd_key2scan(struct ukbd_softc *sc, int 0x72, /* Apple Keyboard JIS (Eisu) */ }; - if ((code >= 89) && (code < (int)(89 + (sizeof(scan) / sizeof(scan[0]))))) { + if ((code >= 89) && (code < (int)(89 + nitems(scan)))) { code = scan[code - 89]; } /* Pause/Break */ Modified: head/sys/dev/usb/serial/u3g.c ============================================================================== --- head/sys/dev/usb/serial/u3g.c Tue Apr 19 21:06:39 2016 (r298299) +++ head/sys/dev/usb/serial/u3g.c Tue Apr 19 22:07:36 2016 (r298300) @@ -670,7 +670,7 @@ u3g_sael_m460_init(struct usb_device *ud return; } - for (n = 0; n != (sizeof(setup)/sizeof(setup[0])); n++) { + for (n = 0; n != nitems(setup); n++) { memcpy(&req, setup[n], sizeof(req)); Modified: head/sys/dev/usb/serial/uchcom.c ============================================================================== --- head/sys/dev/usb/serial/uchcom.c Tue Apr 19 21:06:39 2016 (r298299) +++ head/sys/dev/usb/serial/uchcom.c Tue Apr 19 22:07:36 2016 (r298300) @@ -195,7 +195,7 @@ static const struct uchcom_divider_recor {367, 1, 11719, {0, 0, 0}}, }; -#define NUM_DIVIDERS (sizeof (dividers) / sizeof (dividers[0])) +#define NUM_DIVIDERS nitems(dividers) static const STRUCT_USB_HOST_ID uchcom_devs[] = { {USB_VPI(USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER, 0)}, Modified: head/sys/dev/usb/serial/umcs.c ============================================================================== --- head/sys/dev/usb/serial/umcs.c Tue Apr 19 21:06:39 2016 (r298299) +++ head/sys/dev/usb/serial/umcs.c Tue Apr 19 22:07:36 2016 (r298300) @@ -1072,7 +1072,7 @@ umcs7840_set_baudrate(struct umcs7840_so /* Maximum speeds for standard frequences, when PLL is not used */ static const uint32_t umcs7840_baudrate_divisors[] = {0, 115200, 230400, 403200, 460800, 806400, 921600, 1572864, 3145728,}; -static const uint8_t umcs7840_baudrate_divisors_len = sizeof(umcs7840_baudrate_divisors) / sizeof(umcs7840_baudrate_divisors[0]); +static const uint8_t umcs7840_baudrate_divisors_len = nitems(umcs7840_baudrate_divisors); static usb_error_t umcs7840_calc_baudrate(uint32_t rate, uint16_t *divisor, uint8_t *clk) Modified: head/sys/dev/usb/serial/uplcom.c ============================================================================== --- head/sys/dev/usb/serial/uplcom.c Tue Apr 19 21:06:39 2016 (r298299) +++ head/sys/dev/usb/serial/uplcom.c Tue Apr 19 22:07:36 2016 (r298300) @@ -642,7 +642,7 @@ static const uint32_t uplcom_rates[] = { 230400, 460800, 614400, 921600, 1228800 }; -#define N_UPLCOM_RATES (sizeof(uplcom_rates)/sizeof(uplcom_rates[0])) +#define N_UPLCOM_RATES nitems(uplcom_rates) static int uplcom_pre_param(struct ucom_softc *ucom, struct termios *t)