[src/nick-nhusb]: src/sys/dev/usb KNF

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1eb2dabf622d
branches:  nick-nhusb
changeset: 334101:1eb2dabf622d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Feb 01 06:15:41 2015 +0000

description:
KNF

diffstat:

 sys/dev/usb/ehci.c    |  14 +++++++-------
 sys/dev/usb/ehcivar.h |   6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (82 lines):

diff -r 4b872923ff5d -r 1eb2dabf622d sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Sat Jan 31 22:28:15 2015 +0000
+++ b/sys/dev/usb/ehci.c        Sun Feb 01 06:15:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.234.2.28 2015/01/02 08:52:14 skrll Exp $ */
+/*     $NetBSD: ehci.c,v 1.234.2.29 2015/02/01 06:15:41 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.234.2.28 2015/01/02 08:52:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.29 2015/02/01 06:15:41 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -3442,7 +3442,7 @@
        if (xfer->ux_status != USBD_NOMEM && ehci_active_intr_list(ex)) {
                ehci_del_intr_list(sc, ex);     /* remove from active list */
                ehci_free_sqtd_chain(sc, ex->ex_sqtdstart, NULL);
-               usb_syncmem(&epipe->u.ctl.reqdma, 0, sizeof *req,
+               usb_syncmem(&epipe->u.ctl.reqdma, 0, sizeof(*req),
                    BUS_DMASYNC_POSTWRITE);
                if (len)
                        usb_syncmem(&xfer->ux_dmabuf, 0, len,
@@ -3549,8 +3549,8 @@
                next = stat;
        }
 
-       memcpy(KERNADDR(&epipe->u.ctl.reqdma, 0), req, sizeof *req);
-       usb_syncmem(&epipe->u.ctl.reqdma, 0, sizeof *req, BUS_DMASYNC_PREWRITE);
+       memcpy(KERNADDR(&epipe->u.ctl.reqdma, 0), req, sizeof(*req));
+       usb_syncmem(&epipe->u.ctl.reqdma, 0, sizeof(*req), BUS_DMASYNC_PREWRITE);
 
        /* Clear toggle */
        setup->qtd.qtd_status = htole32(
@@ -3558,14 +3558,14 @@
            EHCI_QTD_SET_PID(EHCI_QTD_PID_SETUP) |
            EHCI_QTD_SET_CERR(3) |
            EHCI_QTD_SET_TOGGLE(0) |
-           EHCI_QTD_SET_BYTES(sizeof *req)
+           EHCI_QTD_SET_BYTES(sizeof(*req))
            );
        setup->qtd.qtd_buffer[0] = htole32(DMAADDR(&epipe->u.ctl.reqdma, 0));
        setup->qtd.qtd_buffer_hi[0] = 0;
        setup->nextqtd = next;
        setup->qtd.qtd_next = setup->qtd.qtd_altnext = htole32(next->physaddr);
        setup->xfer = xfer;
-       setup->len = sizeof *req;
+       setup->len = sizeof(*req);
        usb_syncmem(&setup->dma, setup->offs, sizeof(setup->qtd),
            BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 
diff -r 4b872923ff5d -r 1eb2dabf622d sys/dev/usb/ehcivar.h
--- a/sys/dev/usb/ehcivar.h     Sat Jan 31 22:28:15 2015 +0000
+++ b/sys/dev/usb/ehcivar.h     Sun Feb 01 06:15:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehcivar.h,v 1.42.14.7 2014/12/24 14:11:05 skrll Exp $ */
+/*     $NetBSD: ehcivar.h,v 1.42.14.8 2015/02/01 06:15:41 skrll Exp $ */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
        uint16_t len;
 } ehci_soft_qtd_t;
 #define EHCI_SQTD_ALIGN        MAX(EHCI_QTD_ALIGN, CACHE_LINE_SIZE)
-#define EHCI_SQTD_SIZE ((sizeof (struct ehci_soft_qtd) + EHCI_SQTD_ALIGN - 1) & -EHCI_SQTD_ALIGN)
+#define EHCI_SQTD_SIZE ((sizeof(struct ehci_soft_qtd) + EHCI_SQTD_ALIGN - 1) & -EHCI_SQTD_ALIGN)
 #define EHCI_SQTD_CHUNK (EHCI_PAGE_SIZE / EHCI_SQTD_SIZE)
 
 typedef struct ehci_soft_qh {
@@ -57,7 +57,7 @@
        int offs;                       /* QH's offset in usb_dma_t */
        int islot;
 } ehci_soft_qh_t;
-#define EHCI_SQH_SIZE ((sizeof (struct ehci_soft_qh) + EHCI_QH_ALIGN - 1) / EHCI_QH_ALIGN * EHCI_QH_ALIGN)
+#define EHCI_SQH_SIZE ((sizeof(struct ehci_soft_qh) + EHCI_QH_ALIGN - 1) / EHCI_QH_ALIGN * EHCI_QH_ALIGN)
 #define EHCI_SQH_CHUNK (EHCI_PAGE_SIZE / EHCI_SQH_SIZE)
 
 typedef struct ehci_soft_itd {