diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2016-07-14 04:19:26 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2016-07-14 04:19:26 +0000 |
| commit | d6ea4408ca56aec0f951d081215eae0c02ccd042 (patch) | |
| tree | 247303fcb93e654baddf46cc06f101a3a2d6f575 /sys/dev/usb | |
| parent | ab58a4fa0d224c6f4b253b8102d9f43c82f67570 (diff) | |
KNF. No functional change.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ubt.c | 22 | ||||
| -rw-r--r-- | sys/dev/usb/uyap.c | 21 |
2 files changed, 23 insertions, 20 deletions
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c index 98b65affba3..a91bdc2e063 100644 --- a/sys/dev/usb/ubt.c +++ b/sys/dev/usb/ubt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubt.c,v 1.55 2016/07/07 06:55:42 msaitoh Exp $ */ +/* $NetBSD: ubt.c,v 1.56 2016/07/14 04:19:27 msaitoh Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.55 2016/07/07 06:55:42 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.56 2016/07/14 04:19:27 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -441,19 +441,19 @@ ubt_match(device_t parent, cfdata_t match, void *aux) DPRINTFN(50, "ubt_match\n"); for (i = 0; i < __arraycount(ubt_dev); i++) { - if (ubt_dev[i].vendor != -1 + if (ubt_dev[i].vendor != -1 && ubt_dev[i].vendor != (int)uaa->uaa_vendor) continue; - if (ubt_dev[i].product != -1 + if (ubt_dev[i].product != -1 && ubt_dev[i].product != (int)uaa->uaa_product) continue; - if (ubt_dev[i].class != -1 + if (ubt_dev[i].class != -1 && ubt_dev[i].class != uaa->uaa_class) continue; - if (ubt_dev[i].subclass != -1 + if (ubt_dev[i].subclass != -1 && ubt_dev[i].subclass != uaa->uaa_subclass) continue; - if (ubt_dev[i].proto != -1 + if (ubt_dev[i].proto != -1 && ubt_dev[i].proto != uaa->uaa_proto) continue; @@ -496,7 +496,8 @@ ubt_attach(device_t parent, device_t self, void *aux) */ err = usbd_set_config_index(sc->sc_udev, 0, 1); if (err) { - aprint_error_dev(self, "failed to set configuration idx 0: %s\n", + aprint_error_dev(self, + "failed to set configuration idx 0: %s\n", usbd_errstr(err)); return; @@ -510,8 +511,9 @@ ubt_attach(device_t parent, device_t self, void *aux) */ err = usbd_device2interface_handle(sc->sc_udev, 0, &sc->sc_iface0); if (err) { - aprint_error_dev(self, "Could not get interface 0 handle %s (%d)\n", - usbd_errstr(err), err); + aprint_error_dev(self, + "Could not get interface 0 handle %s (%d)\n", + usbd_errstr(err), err); return; } diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c index 8bbcf59906f..f684160289a 100644 --- a/sys/dev/usb/uyap.c +++ b/sys/dev/usb/uyap.c @@ -1,4 +1,4 @@ -/* $NetBSD: uyap.c,v 1.20 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uyap.c,v 1.21 2016/07/14 04:19:27 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.20 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.21 2016/07/14 04:19:27 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -53,14 +53,15 @@ struct uyap_softc { device_t sc_dev; /* base device */ }; -int uyap_match(device_t, cfdata_t, void *); -void uyap_attach(device_t, device_t, void *); -int uyap_detach(device_t, int); -int uyap_activate(device_t, enum devact); +int uyap_match(device_t, cfdata_t, void *); +void uyap_attach(device_t, device_t, void *); +int uyap_detach(device_t, int); +int uyap_activate(device_t, enum devact); extern struct cfdriver uyap_cd; -CFATTACH_DECL_NEW(uyap, sizeof(struct uyap_softc), uyap_match, uyap_attach, uyap_detach, uyap_activate); +CFATTACH_DECL_NEW(uyap, sizeof(struct uyap_softc), uyap_match, uyap_attach, + uyap_detach, uyap_activate); -int +int uyap_match(device_t parent, cfdata_t match, void *aux) { struct usb_attach_arg *uaa = aux; @@ -73,7 +74,7 @@ uyap_match(device_t parent, cfdata_t match, void *aux) return (UMATCH_NONE); } -void +void uyap_attach(device_t parent, device_t self, void *aux) { struct uyap_softc *sc = device_private(self); @@ -105,7 +106,7 @@ uyap_attach(device_t parent, device_t self, void *aux) return; } -int +int uyap_detach(device_t self, int flags) { #if 0 |
