summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2020-03-05 08:30:58 +0000
committerskrll <skrll@NetBSD.org>2020-03-05 08:30:58 +0000
commit2ea09ec741ab4dc596cfffc8b2a80ca273b43a04 (patch)
treea193fe0bd2391fdbf149cf4452ce1760385a8658 /sys/dev
parent964a4680337ad1b52fb10f00cae5fb2086ced030 (diff)
Use howmany. NFC.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/ehci.c12
-rw-r--r--sys/dev/usb/ohci.c9
2 files changed, 10 insertions, 11 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 49f666f0015..df0119825a2 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.274 2020/02/21 12:41:29 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.275 2020/03/05 08:35:16 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.274 2020/02/21 12:41:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.275 2020/03/05 08:35:16 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2913,7 +2913,7 @@ ehci_alloc_sqtd_chain(ehci_softc_t *sc, struct usbd_xfer *xfer,
KASSERT(alen != 0 || (!rd && (flags & USBD_FORCE_SHORT_XFER)));
size_t nsqtd = (!rd && (flags & USBD_FORCE_SHORT_XFER)) ? 1 : 0;
- nsqtd += ((alen + EHCI_PAGE_SIZE - 1) / EHCI_PAGE_SIZE);
+ nsqtd += howmany(alen, EHCI_PAGE_SIZE);
exfer->ex_sqtds = kmem_zalloc(sizeof(ehci_soft_qtd_t *) * nsqtd,
KM_SLEEP);
exfer->ex_nsqtd = nsqtd;
@@ -3061,7 +3061,7 @@ ehci_reset_sqtd_chain(ehci_softc_t *sc, struct usbd_xfer *xfer,
ehci_append_sqtd(sqtd, prev);
- if (((curlen + mps - 1) / mps) & 1) {
+ if (howmany(curlen, mps) & 1) {
tog ^= 1;
}
@@ -4582,7 +4582,7 @@ ehci_device_isoc_init(struct usbd_xfer *xfer)
}
ufrperframe = uimax(1, USB_UFRAMES_PER_FRAME / (1 << (i - 1)));
- frames = (xfer->ux_nframes + (ufrperframe - 1)) / ufrperframe;
+ frames = howmany(xfer->ux_nframes, ufrperframe);
for (i = 0, prev = NULL; i < frames; i++, prev = itd) {
itd = ehci_alloc_itd(sc);
@@ -4717,7 +4717,7 @@ ehci_device_isoc_transfer(struct usbd_xfer *xfer)
}
ufrperframe = uimax(1, USB_UFRAMES_PER_FRAME / (1 << (i - 1)));
- frames = (xfer->ux_nframes + (ufrperframe - 1)) / ufrperframe;
+ frames = howmany(xfer->ux_nframes, ufrperframe);
uframes = USB_UFRAMES_PER_FRAME / ufrperframe;
if (frames == 0) {
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 781510a447e..b129e3197fc 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.297 2020/03/05 08:12:30 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.298 2020/03/05 08:30:58 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.297 2020/03/05 08:12:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.298 2020/03/05 08:30:58 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -531,7 +531,7 @@ ohci_alloc_std_chain(ohci_softc_t *sc, struct usbd_xfer *xfer, int length, int r
KASSERT(length != 0 || (!rd && (flags & USBD_FORCE_SHORT_XFER)));
size_t nstd = (!rd && (flags & USBD_FORCE_SHORT_XFER)) ? 1 : 0;
- nstd += ((length + OHCI_PAGE_SIZE - 1) / OHCI_PAGE_SIZE);
+ nstd += howmany(length, OHCI_PAGE_SIZE);
ox->ox_stds = kmem_zalloc(sizeof(ohci_soft_td_t *) * nstd,
KM_SLEEP);
ox->ox_nstd = nstd;
@@ -3358,8 +3358,7 @@ ohci_device_isoc_init(struct usbd_xfer *xfer)
DPRINTFN(1, "xfer %#jx len %jd flags %jd", (uintptr_t)xfer,
xfer->ux_length, xfer->ux_flags, 0);
- const size_t nfsitd =
- (xfer->ux_nframes + OHCI_ITD_NOFFSET - 1) / OHCI_ITD_NOFFSET;
+ const size_t nfsitd = howmany(xfer->ux_nframes, OHCI_ITD_NOFFSET);
const size_t nbsitd = xfer->ux_bufsize / OHCI_PAGE_SIZE;
const size_t nsitd = MAX(nfsitd, nbsitd) + 1;