diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2016-04-19 22:07:36 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2016-04-19 22:07:36 +0000 |
| commit | 432157dc67e8be49ff2f76a33ae782eb13fb9439 (patch) | |
| tree | 3fd762643283a264a7c51e16778808e2ccf69925 /sys/dev/usb/serial | |
| parent | 3db33b0a8ca1a7990353f6dbce7b72df6f5dd2f4 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb/serial')
| -rw-r--r-- | sys/dev/usb/serial/u3g.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uchcom.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/serial/umcs.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uplcom.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index ab6b20a350ca..9988347243c4 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -670,7 +670,7 @@ u3g_sael_m460_init(struct usb_device *udev) return; } - for (n = 0; n != (sizeof(setup)/sizeof(setup[0])); n++) { + for (n = 0; n != nitems(setup); n++) { memcpy(&req, setup[n], sizeof(req)); diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c index 70f1979355b3..d1063fd4f634 100644 --- a/sys/dev/usb/serial/uchcom.c +++ b/sys/dev/usb/serial/uchcom.c @@ -195,7 +195,7 @@ static const struct uchcom_divider_record dividers[] = {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)}, diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c index b48d5e57b036..6b55b5a8450b 100644 --- a/sys/dev/usb/serial/umcs.c +++ b/sys/dev/usb/serial/umcs.c @@ -1072,7 +1072,7 @@ umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno, uint32_t rate) /* 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) diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c index af0166e16e38..6e238758fa26 100644 --- a/sys/dev/usb/serial/uplcom.c +++ b/sys/dev/usb/serial/uplcom.c @@ -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) |
