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)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
