[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 20/29] usb-hub: use DIV_ROUND_UP
From: |
Marc-André Lureau |
Subject: |
[Qemu-trivial] [PULL 20/29] usb-hub: use DIV_ROUND_UP |
Date: |
Thu, 31 Aug 2017 12:34:23 +0200 |
I used the clang-tidy qemu-round check to generate the fix:
https://github.com/elmarco/clang-tools-extra
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
hw/usb/dev-hub.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index e82a6a6c44..752e30c305 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -109,7 +109,7 @@ static const USBDescIface desc_iface_hub = {
{
.bEndpointAddress = USB_DIR_IN | 0x01,
.bmAttributes = USB_ENDPOINT_XFER_INT,
- .wMaxPacketSize = 1 + (NUM_PORTS + 7) / 8,
+ .wMaxPacketSize = 1 + DIV_ROUND_UP(NUM_PORTS, 8),
.bInterval = 0xff,
},
}
@@ -442,14 +442,14 @@ static void usb_hub_handle_control(USBDevice *dev,
USBPacket *p,
data[2] = NUM_PORTS;
/* fill DeviceRemovable bits */
- limit = ((NUM_PORTS + 1 + 7) / 8) + 7;
+ limit = DIV_ROUND_UP(NUM_PORTS + 1, 8) + 7;
for (n = 7; n < limit; n++) {
data[n] = 0x00;
var_hub_size++;
}
/* fill PortPwrCtrlMask bits */
- limit = limit + ((NUM_PORTS + 7) / 8);
+ limit = limit + DIV_ROUND_UP(NUM_PORTS, 8);
for (;n < limit; n++) {
data[n] = 0xff;
var_hub_size++;
@@ -477,7 +477,7 @@ static void usb_hub_handle_data(USBDevice *dev, USBPacket
*p)
unsigned int status;
uint8_t buf[4];
int i, n;
- n = (NUM_PORTS + 1 + 7) / 8;
+ n = DIV_ROUND_UP(NUM_PORTS + 1, 8);
if (p->iov.size == 1) { /* FreeBSD workaround */
n = 1;
} else if (n > p->iov.size) {
--
2.14.1.146.gd35faa819
- [Qemu-trivial] [PULL 11/29] vnc: use DIV_ROUND_UP, (continued)
- [Qemu-trivial] [PULL 11/29] vnc: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 09/29] vpc: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 12/29] ui: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 13/29] vga: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 14/29] virtio-gpu: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 15/29] monitor: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 16/29] console: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 17/29] virtio-serial: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 18/29] piix: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 19/29] q35: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 20/29] usb-hub: use DIV_ROUND_UP,
Marc-André Lureau <=
- [Qemu-trivial] [PULL 21/29] msix: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 22/29] ppc: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 23/29] i386/dump: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 25/29] decnumber: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 24/29] kvm: use DIV_ROUND_UP, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 26/29] i386: introduce ELF_NOTE_SIZE macro, Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 27/29] i386: replace g_malloc()+memcpy() with g_memdup(), Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 29/29] eepro100: replace g_malloc()+memcpy() with g_memdup(), Marc-André Lureau, 2017/08/31
- [Qemu-trivial] [PULL 28/29] test-iov: replace g_malloc()+memcpy() with g_memdup(), Marc-André Lureau, 2017/08/31
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/29] Code cleanup patches, no-reply, 2017/08/31