diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2016-07-07 06:55:38 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2016-07-07 06:55:38 +0000 |
| commit | 575a7585ffe052b9dac5fb3ff127257dd2a5cb28 (patch) | |
| tree | c5421da8f1b1c98cdbbe988cd984e6fd31fcdbff /sys/dev | |
| parent | ed4c94c1f059db38c1bf5b31d4b80b6eb3e0541f (diff) | |
KNF. Remove extra spaces. No functional change.
Diffstat (limited to 'sys/dev')
145 files changed, 1171 insertions, 1100 deletions
diff --git a/sys/dev/acpi/sony_acpi.c b/sys/dev/acpi/sony_acpi.c index f16020cdb99..577691c8d82 100644 --- a/sys/dev/acpi/sony_acpi.c +++ b/sys/dev/acpi/sony_acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: sony_acpi.c,v 1.22 2014/02/25 18:30:09 pooka Exp $ */ +/* $NetBSD: sony_acpi.c,v 1.23 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.22 2014/02/25 18:30:09 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.23 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/sysctl.h> @@ -122,7 +122,8 @@ sony_sysctl_helper(SYSCTLFN_ARGS) rv = acpi_eval_integer(sc->sc_node->ad_handle, buf, &acpi_val); if (ACPI_FAILURE(rv)) { #ifdef DIAGNOSTIC - printf("%s: couldn't get `%s'\n", device_xname(sc->sc_dev), buf); + printf("%s: couldn't get `%s'\n", device_xname(sc->sc_dev), + buf); #endif return EIO; } @@ -293,11 +294,13 @@ sony_acpi_attach(device_t parent, device_t self, void *aux) if (!pmf_event_register(self, PMFE_DISPLAY_BRIGHTNESS_UP, sony_acpi_brightness_up, true)) - aprint_error_dev(self, "couldn't register BRIGHTNESS UP handler\n"); + aprint_error_dev(self, + "couldn't register BRIGHTNESS UP handler\n"); if (!pmf_event_register(self, PMFE_DISPLAY_BRIGHTNESS_DOWN, sony_acpi_brightness_down, true)) - aprint_error_dev(self, "couldn't register BRIGHTNESS DOWN handler\n"); + aprint_error_dev(self, + "couldn't register BRIGHTNESS DOWN handler\n"); } static void diff --git a/sys/dev/bluetooth/btmagic.c b/sys/dev/bluetooth/btmagic.c index ae7f53cf90d..e6019007e84 100644 --- a/sys/dev/bluetooth/btmagic.c +++ b/sys/dev/bluetooth/btmagic.c @@ -1,4 +1,4 @@ -/* $NetBSD: btmagic.c,v 1.15 2015/12/13 21:13:00 plunky Exp $ */ +/* $NetBSD: btmagic.c,v 1.16 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -85,7 +85,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.15 2015/12/13 21:13:00 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.16 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -196,15 +196,15 @@ static int btmagic_listen(struct btmagic_softc *); static int btmagic_connect(struct btmagic_softc *); static int btmagic_sysctl_resolution(SYSCTLFN_PROTO); static int btmagic_sysctl_scale(SYSCTLFN_PROTO); -static int btmagic_tap(struct btmagic_softc *, int); +static int btmagic_tap(struct btmagic_softc *, int); static int btmagic_sysctl_taptimeout(SYSCTLFN_PROTO); CFATTACH_DECL_NEW(btmagic, sizeof(struct btmagic_softc), btmagic_match, btmagic_attach, btmagic_detach, NULL); /* wsmouse(4) accessops */ -static int btmagic_wsmouse_enable(void *); -static int btmagic_wsmouse_ioctl(void *, unsigned long, void *, int, struct lwp *); +static int btmagic_wsmouse_enable(void *); +static int btmagic_wsmouse_ioctl(void *, unsigned long, void *, int, struct lwp *); static void btmagic_wsmouse_disable(void *); static const struct wsmouse_accessops btmagic_wsmouse_accessops = { diff --git a/sys/dev/cardbus/if_ex_cardbus.c b/sys/dev/cardbus/if_ex_cardbus.c index 40c6ef31a4d..534fa09717c 100644 --- a/sys/dev/cardbus/if_ex_cardbus.c +++ b/sys/dev/cardbus/if_ex_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ex_cardbus.c,v 1.55 2011/08/01 11:20:27 drochner Exp $ */ +/* $NetBSD: if_ex_cardbus.c,v 1.56 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998 and 1999 @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.55 2011/08/01 11:20:27 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.56 2016/07/07 06:55:41 msaitoh Exp $"); /* #define EX_DEBUG 4 */ /* define to report information for debugging */ @@ -255,16 +255,15 @@ ex_cardbus_attach(device_t parent, device_t self, void *aux) adr1 | PCI_MAPREG_TYPE_MEM; } else { - aprint_error_dev(self, "unable to map function " - "status window\n"); + aprint_error_dev(self, + "unable to map function status window\n"); return; } /* Setup interrupt acknowledge hook */ sc->intr_ack = ex_cardbus_intr_ack; } - } - else { + } else { aprint_naive(": can't map i/o space\n"); return; } diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c index 1221c0aa763..6c5d3c44f07 100644 --- a/sys/dev/cardbus/if_fxp_cardbus.c +++ b/sys/dev/cardbus/if_fxp_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fxp_cardbus.c,v 1.51 2015/04/13 16:33:24 riastradh Exp $ */ +/* $NetBSD: if_fxp_cardbus.c,v 1.52 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.51 2015/04/13 16:33:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.52 2016/07/07 06:55:41 msaitoh Exp $"); #include "opt_inet.h" @@ -102,8 +102,7 @@ CFATTACH_DECL3_NEW(fxp_cardbus, sizeof(struct fxp_cardbus_softc), #endif static int -fxp_cardbus_match(device_t parent, cfdata_t match, - void *aux) +fxp_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; @@ -115,8 +114,7 @@ fxp_cardbus_match(device_t parent, cfdata_t match, } static void -fxp_cardbus_attach(device_t parent, device_t self, - void *aux) +fxp_cardbus_attach(device_t parent, device_t self, void *aux) { struct fxp_cardbus_softc *csc = device_private(self); struct fxp_softc *sc = &csc->sc; diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index fa0ef207bf9..ae8b5186858 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtw_cardbus.c,v 1.44 2013/11/21 21:17:50 riz Exp $ */ +/* $NetBSD: if_rtw_cardbus.c,v 1.45 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.44 2013/11/21 21:17:50 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.45 2016/07/07 06:55:41 msaitoh Exp $"); #include "opt_inet.h" @@ -128,8 +128,8 @@ void rtw_cardbus_attach(device_t, device_t, void *); int rtw_cardbus_detach(device_t, int); CFATTACH_DECL3_NEW(rtw_cardbus, sizeof(struct rtw_cardbus_softc), - rtw_cardbus_match, rtw_cardbus_attach, rtw_cardbus_detach, NULL, NULL, NULL, - DVF_DETACH_SHUTDOWN); + rtw_cardbus_match, rtw_cardbus_attach, rtw_cardbus_detach, NULL, NULL, + NULL, DVF_DETACH_SHUTDOWN); void rtw_cardbus_setup(struct rtw_cardbus_softc *); diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c index 0af54e7025e..3528f667de2 100644 --- a/sys/dev/cardbus/ohci_cardbus.c +++ b/sys/dev/cardbus/ohci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci_cardbus.c,v 1.41 2016/04/23 10:15:31 skrll Exp $ */ +/* $NetBSD: ohci_cardbus.c,v 1.42 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.41 2016/04/23 10:15:31 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.42 2016/07/07 06:55:41 msaitoh Exp $"); #include "ehci_cardbus.h" @@ -83,7 +83,8 @@ struct ohci_cardbus_softc { }; CFATTACH_DECL_NEW(ohci_cardbus, sizeof(struct ohci_cardbus_softc), - ohci_cardbus_match, ohci_cardbus_attach, ohci_cardbus_detach, ohci_activate); + ohci_cardbus_match, ohci_cardbus_attach, ohci_cardbus_detach, + ohci_activate); int ohci_cardbus_match(device_t parent, cfdata_t match, void *aux) diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c index cf87b33f031..25c01e2bbe4 100644 --- a/sys/dev/cardbus/uhci_cardbus.c +++ b/sys/dev/cardbus/uhci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci_cardbus.c,v 1.22 2016/04/23 10:15:31 skrll Exp $ */ +/* $NetBSD: uhci_cardbus.c,v 1.23 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998-2005 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.22 2016/04/23 10:15:31 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.23 2016/07/07 06:55:41 msaitoh Exp $"); #include "ehci_cardbus.h" @@ -72,7 +72,8 @@ static void uhci_cardbus_attach(device_t, device_t, void *); static int uhci_cardbus_detach(device_t, int); CFATTACH_DECL_NEW(uhci_cardbus, sizeof(struct uhci_cardbus_softc), - uhci_cardbus_match, uhci_cardbus_attach, uhci_cardbus_detach, uhci_activate); + uhci_cardbus_match, uhci_cardbus_attach, uhci_cardbus_detach, + uhci_activate); static int uhci_cardbus_match(device_t parent, cfdata_t match, void *aux) diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c index 2ecb08955af..1af6e14a755 100644 --- a/sys/dev/cgd.c +++ b/sys/dev/cgd.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgd.c,v 1.106 2015/11/28 21:06:30 mlelstv Exp $ */ +/* $NetBSD: cgd.c,v 1.107 2016/07/07 06:55:40 msaitoh Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.106 2015/11/28 21:06:30 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.107 2016/07/07 06:55:40 msaitoh Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -203,7 +203,8 @@ cgd_attach(device_t parent, device_t self, void *aux) disk_init(&sc->sc_dksc.sc_dkdev, sc->sc_dksc.sc_xname, &cgddkdriver); if (!pmf_device_register(self, NULL, NULL)) - aprint_error_dev(self, "unable to register power management hooks\n"); + aprint_error_dev(self, + "unable to register power management hooks\n"); } @@ -457,9 +458,9 @@ cgdiodone(struct buf *nbp) DPRINTF_FOLLOW(("cgdiodone(%p)\n", nbp)); DPRINTF(CGDB_IO, ("cgdiodone: bp %p bcount %d resid %d\n", obp, obp->b_bcount, obp->b_resid)); - DPRINTF(CGDB_IO, (" dev 0x%"PRIx64", nbp %p bn %" PRId64 " addr %p bcnt %d\n", - nbp->b_dev, nbp, nbp->b_blkno, nbp->b_data, - nbp->b_bcount)); + DPRINTF(CGDB_IO, (" dev 0x%"PRIx64", nbp %p bn %" PRId64 + " addr %p bcnt %d\n", nbp->b_dev, nbp, nbp->b_blkno, nbp->b_data, + nbp->b_bcount)); if (nbp->b_error != 0) { obp->b_error = nbp->b_error; DPRINTF(CGDB_IO, ("%s: error %d\n", dksc->sc_xname, diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index c661aebccdb..c529d140f84 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $NetBSD: adw.c,v 1.52 2012/10/27 17:18:18 chs Exp $ */ +/* $NetBSD: adw.c,v 1.53 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Generic driver for the Advanced Systems Inc. SCSI controllers @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.52 2012/10/27 17:18:18 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.53 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -432,11 +432,12 @@ adw_attach(ADW_SOFTC *sc) */ ncontrols = adw_create_ccbs(sc, sc->sc_control->ccbs, ADW_MAX_CCB); if (ncontrols == 0) { - aprint_error_dev(sc->sc_dev, "unable to create Control Blocks\n"); + aprint_error_dev(sc->sc_dev, + "unable to create Control Blocks\n"); return; /* (ENOMEM) */ ; } else if (ncontrols != ADW_MAX_CCB) { - aprint_error_dev(sc->sc_dev, "WARNING: only %d of %d Control Blocks" - " created\n", + aprint_error_dev(sc->sc_dev, + "WARNING: only %d of %d Control Blocks created\n", ncontrols, ADW_MAX_CCB); } diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c index b07089381d4..942d67dac88 100644 --- a/sys/dev/ic/aic6915.c +++ b/sys/dev/ic/aic6915.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic6915.c,v 1.32 2016/06/10 13:27:13 ozaki-r Exp $ */ +/* $NetBSD: aic6915.c,v 1.33 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.32 2016/06/10 13:27:13 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.33 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> @@ -154,9 +154,8 @@ sf_attach(struct sf_softc *sc) else { if ((error = bus_space_subregion(sc->sc_st, sc->sc_sh, SF_GENREG_OFFSET, SF_FUNCREG_SIZE, &sc->sc_sh_func)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to sub-region functional " - "registers, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, "unable to sub-region " + "functional registers, error = %d\n", error); return; } } @@ -176,16 +175,16 @@ sf_attach(struct sf_softc *sc) if ((error = bus_dmamem_alloc(sc->sc_dmat, sizeof(struct sf_control_data), PAGE_SIZE, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to allocate control data, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "unable to allocate control data, error = %d\n", error); goto fail_0; } if ((error = bus_dmamem_map(sc->sc_dmat, &seg, rseg, sizeof(struct sf_control_data), (void **)&sc->sc_control_data, BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to map control data, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "unable to map control data, error = %d\n", error); goto fail_1; } @@ -193,16 +192,16 @@ sf_attach(struct sf_softc *sc) sizeof(struct sf_control_data), 1, sizeof(struct sf_control_data), 0, BUS_DMA_NOWAIT, &sc->sc_cddmamap)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to create control data DMA map, " - "error = %d\n", error); + aprint_error_dev(sc->sc_dev, "unable to create control data " + "DMA map, error = %d\n", error); goto fail_2; } if ((error = bus_dmamap_load(sc->sc_dmat, sc->sc_cddmamap, sc->sc_control_data, sizeof(struct sf_control_data), NULL, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to load control data DMA map, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, "unable to load control data " + "DMA map, error = %d\n", error); goto fail_3; } @@ -213,8 +212,9 @@ sf_attach(struct sf_softc *sc) if ((error = bus_dmamap_create(sc->sc_dmat, MCLBYTES, SF_NTXFRAGS, MCLBYTES, 0, BUS_DMA_NOWAIT, &sc->sc_txsoft[i].ds_dmamap)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to create tx DMA map %d, " - "error = %d\n", i, error); + aprint_error_dev(sc->sc_dev, + "unable to create tx DMA map %d, error = %d\n", i, + error); goto fail_4; } } @@ -226,8 +226,9 @@ sf_attach(struct sf_softc *sc) if ((error = bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1, MCLBYTES, 0, BUS_DMA_NOWAIT, &sc->sc_rxsoft[i].ds_dmamap)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to create rx DMA map %d, " - "error = %d\n", i, error); + aprint_error_dev(sc->sc_dev, + "unable to create rx DMA map %d, error = %d\n", i, + error); goto fail_5; } } @@ -247,7 +248,8 @@ sf_attach(struct sf_softc *sc) ether_sprintf(enaddr)); if (sf_funcreg_read(sc, SF_PciDeviceConfig) & PDC_System64) - printf("%s: 64-bit PCI slot detected\n", device_xname(sc->sc_dev)); + printf("%s: 64-bit PCI slot detected\n", + device_xname(sc->sc_dev)); /* * Initialize our media structures and probe the MII. @@ -395,14 +397,15 @@ sf_start(struct ifnet *ifp) BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) { MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { - aprint_error_dev(sc->sc_dev, "unable to allocate Tx mbuf\n"); + aprint_error_dev(sc->sc_dev, + "unable to allocate Tx mbuf\n"); break; } if (m0->m_pkthdr.len > MHLEN) { MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { - aprint_error_dev(sc->sc_dev, "unable to allocate Tx " - "cluster\n"); + aprint_error_dev(sc->sc_dev, + "unable to allocate Tx cluster\n"); m_freem(m); break; } @@ -412,8 +415,9 @@ sf_start(struct ifnet *ifp) error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); if (error) { - aprint_error_dev(sc->sc_dev, "unable to load Tx buffer, " - "error = %d\n", error); + aprint_error_dev(sc->sc_dev, + "unable to load Tx buffer, error = %d\n", + error); break; } } @@ -572,7 +576,8 @@ sf_intr(void *arg) /* DMA errors. */ if (isr & IS_DmaErrInt) { wantinit = 1; - aprint_error_dev(sc->sc_dev, "WARNING: DMA error\n"); + aprint_error_dev(sc->sc_dev, + "WARNING: DMA error\n"); } /* Transmit FIFO underruns. */ @@ -638,8 +643,8 @@ sf_txintr(struct sf_softc *sc) txidx = SF_TCD_INDEX_TO_HOST(TCD_INDEX(tcd)); #ifdef DIAGNOSTIC if ((tcd & TCD_PR) == 0) - aprint_error_dev(sc->sc_dev, "Tx queue mismatch, index %d\n", - txidx); + aprint_error_dev(sc->sc_dev, + "Tx queue mismatch, index %d\n", txidx); #endif /* * NOTE: stats are updated later. We're just @@ -957,9 +962,9 @@ sf_init(struct ifnet *ifp) ds = &sc->sc_rxsoft[i]; if (ds->ds_mbuf == NULL) { if ((error = sf_add_rxbuf(sc, i)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to allocate or map rx " - "buffer %d, error = %d\n", - i, error); + aprint_error_dev(sc->sc_dev, + "unable to allocate or map rx buffer %d, " + "error = %d\n", i, error); /* * XXX Should attempt to run with fewer receive * XXX buffers instead of just failing. @@ -1211,8 +1216,8 @@ sf_add_rxbuf(struct sf_softc *sc, int idx) m->m_ext.ext_buf, m->m_ext.ext_size, NULL, BUS_DMA_READ|BUS_DMA_NOWAIT); if (error) { - aprint_error_dev(sc->sc_dev, "can't load rx DMA map %d, error = %d\n", - idx, error); + aprint_error_dev(sc->sc_dev, + "can't load rx DMA map %d, error = %d\n", idx, error); panic("sf_add_rxbuf"); /* XXX */ } diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c index fd461b4ef82..d2e533de693 100644 --- a/sys/dev/ic/cac.c +++ b/sys/dev/ic/cac.c @@ -1,4 +1,4 @@ -/* $NetBSD: cac.c,v 1.55 2015/03/12 15:33:10 christos Exp $ */ +/* $NetBSD: cac.c,v 1.56 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2000, 2006, 2007 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.55 2015/03/12 15:33:10 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.56 2016/07/07 06:55:41 msaitoh Exp $"); #include "bio.h" @@ -107,8 +107,7 @@ cac_init(struct cac_softc *sc, const char *intrstr, int startfw) char firm[8]; if (intrstr != NULL) - aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", - intrstr); + aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr); SIMPLEQ_INIT(&sc->sc_ccb_free); SIMPLEQ_INIT(&sc->sc_ccb_queue); diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c index 11f244c5f3b..05edc6864e0 100644 --- a/sys/dev/ic/dpt.c +++ b/sys/dev/ic/dpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: dpt.c,v 1.72 2014/10/18 08:33:27 snj Exp $ */ +/* $NetBSD: dpt.c,v 1.73 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.72 2014/10/18 08:33:27 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.73 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -447,15 +447,15 @@ dpt_init(struct dpt_softc *sc, const char *intrstr) aprint_normal("%s %s (%s)\n", vendor, dpt_cname[i + 1], model); if (intrstr != NULL) - aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", - intrstr); + aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr); maxchannel = (ec->ec_feat3 & EC_F3_MAX_CHANNEL_MASK) >> EC_F3_MAX_CHANNEL_SHIFT; maxtarget = (ec->ec_feat3 & EC_F3_MAX_TARGET_MASK) >> EC_F3_MAX_TARGET_SHIFT; - aprint_normal_dev(sc->sc_dev, "%d queued commands, %d channel(s), adapter on ID(s)", + aprint_normal_dev(sc->sc_dev, + "%d queued commands, %d channel(s), adapter on ID(s)", sc->sc_nccbs, maxchannel + 1); for (i = 0; i <= maxchannel; i++) { diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c index 6631a859769..a2058e4451d 100644 --- a/sys/dev/ic/mlx.c +++ b/sys/dev/ic/mlx.c @@ -1,4 +1,4 @@ -/* $NetBSD: mlx.c,v 1.62 2014/07/25 08:10:37 dholland Exp $ */ +/* $NetBSD: mlx.c,v 1.63 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.62 2014/07/25 08:10:37 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.63 2016/07/07 06:55:41 msaitoh Exp $"); #include "ld.h" @@ -282,26 +282,30 @@ mlx_init(struct mlx_softc *mlx, const char *intrstr) if ((rv = bus_dmamem_alloc(mlx->mlx_dmat, size, PAGE_SIZE, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(mlx->mlx_dv, "unable to allocate sglists, rv = %d\n", rv); + aprint_error_dev(mlx->mlx_dv, + "unable to allocate sglists, rv = %d\n", rv); return; } if ((rv = bus_dmamem_map(mlx->mlx_dmat, &seg, rseg, size, (void **)&mlx->mlx_sgls, BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { - aprint_error_dev(mlx->mlx_dv, "unable to map sglists, rv = %d\n", rv); + aprint_error_dev(mlx->mlx_dv, + "unable to map sglists, rv = %d\n", rv); return; } if ((rv = bus_dmamap_create(mlx->mlx_dmat, size, 1, size, 0, BUS_DMA_NOWAIT, &mlx->mlx_dmamap)) != 0) { - aprint_error_dev(mlx->mlx_dv, "unable to create sglist DMA map, rv = %d\n", rv); + aprint_error_dev(mlx->mlx_dv, + "unable to create sglist DMA map, rv = %d\n", rv); return; } if ((rv = bus_dmamap_load(mlx->mlx_dmat, mlx->mlx_dmamap, mlx->mlx_sgls, size, NULL, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(mlx->mlx_dv, "unable to load sglist DMA map, rv = %d\n", rv); + aprint_error_dev(mlx->mlx_dv, + "unable to load sglist DMA map, rv = %d\n", rv); return; } @@ -334,7 +338,8 @@ mlx_init(struct mlx_softc *mlx, const char *intrstr) /* If we've got a reset routine, then reset the controller now. */ if (mlx->mlx_reset != NULL) { - printf("%s: resetting controller...\n", device_xname(mlx->mlx_dv)); + printf("%s: resetting controller...\n", + device_xname(mlx->mlx_dv)); if ((*mlx->mlx_reset)(mlx) != 0) { aprint_error_dev(mlx->mlx_dv, "reset failed\n"); return; @@ -481,7 +486,8 @@ mlx_init(struct mlx_softc *mlx, const char *intrstr) printf("%s: WARNING: few CCBs available\n", device_xname(mlx->mlx_dv)); if (ci->ci_max_sg < MLX_MAX_SEGS) { - aprint_error_dev(mlx->mlx_dv, "oops, not enough S/G segments\n"); + aprint_error_dev(mlx->mlx_dv, + "oops, not enough S/G segments\n"); return; } #endif @@ -1179,8 +1185,8 @@ mlx_periodic_enquiry(struct mlx_ccb *mc) break; } - printf("%s: unit %d %s\n", device_xname(mlx->mlx_dv), - i, statestr); + printf("%s: unit %d %s\n", + device_xname(mlx->mlx_dv), i, statestr); /* Save new state. */ dr->ms_state = mes[i].sd_state; @@ -1298,7 +1304,8 @@ mlx_periodic_eventlog_respond(struct mlx_ccb *mc) reason = "for unknown reason"; printf("%s: physical drive %d:%d killed %s\n", - device_xname(mlx->mlx_dv), chan, targ, reason); + device_xname(mlx->mlx_dv), chan, targ, + reason); } /* @@ -1317,8 +1324,8 @@ mlx_periodic_eventlog_respond(struct mlx_ccb *mc) (el->el_asq == 0x01 || el->el_asq == 0x02)))) { printf("%s: physical drive %d:%d error log: " "sense = %d asc = %x asq = %x\n", - device_xname(mlx->mlx_dv), chan, targ, sensekey, - el->el_asc, el->el_asq); + device_xname(mlx->mlx_dv), chan, targ, + sensekey, el->el_asc, el->el_asq); printf("%s: info = %d:%d:%d:%d " " csi = %d:%d:%d:%d\n", device_xname(mlx->mlx_dv), @@ -1333,13 +1340,13 @@ mlx_periodic_eventlog_respond(struct mlx_ccb *mc) break; default: - aprint_error_dev(mlx->mlx_dv, "unknown log message type 0x%x\n", - el->el_type); + aprint_error_dev(mlx->mlx_dv, + "unknown log message type 0x%x\n", el->el_type); break; } } else { - aprint_error_dev(mlx->mlx_dv, "error reading message log - %s\n", - mlx_ccb_diagnose(mc)); + aprint_error_dev(mlx->mlx_dv, + "error reading message log - %s\n", mlx_ccb_diagnose(mc)); /* * Give up on all the outstanding messages, as we may have @@ -1466,7 +1473,8 @@ mlx_pause_action(struct mlx_softc *mlx) for (i = 0; i < mlx->mlx_ci.ci_nchan; i++) { if ((1 << i) & mlx->mlx_pause.mp_which) { if (mlx_ccb_alloc(mlx, &mc, 1) != 0) { - aprint_error_dev(mlx->mlx_dv, "%s failed for channel %d\n", + aprint_error_dev(mlx->mlx_dv, + "%s failed for channel %d\n", cmd == MLX_CMD_STOPCHANNEL ? "pause" : "resume", i); continue; @@ -2104,14 +2112,16 @@ mlx_intr(void *cookie) ident--; if (ident >= MLX_MAX_QUEUECNT) { - aprint_error_dev(mlx->mlx_dv, "bad completion returned\n"); + aprint_error_dev(mlx->mlx_dv, + "bad completion returned\n"); continue; } mc = mlx->mlx_ccbs + ident; if (mc->mc_status != MLX_STATUS_BUSY) { - aprint_error_dev(mlx->mlx_dv, "bad completion returned\n"); + aprint_error_dev(mlx->mlx_dv, + "bad completion returned\n"); continue; } @@ -2195,7 +2205,8 @@ mlx_fw_message(struct mlx_softc *mlx, int error, int param1, int param2) return (1); default: - aprint_error_dev(mlx->mlx_dv, "unknown firmware init error %02x:%02x:%02x\n", + aprint_error_dev(mlx->mlx_dv, + "unknown firmware init error %02x:%02x:%02x\n", error, param1, param2); return (0); } diff --git a/sys/dev/ic/opl.c b/sys/dev/ic/opl.c index 4193e287a89..05d2c4f4361 100644 --- a/sys/dev/ic/opl.c +++ b/sys/dev/ic/opl.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl.c,v 1.40 2013/06/28 14:48:17 christos Exp $ */ +/* $NetBSD: opl.c,v 1.41 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.40 2013/06/28 14:48:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.41 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -159,8 +159,8 @@ opl_attach(struct opl_softc *sc) sc->syn.mets = &opl3_midi; size_t len = strlen(sc->syn.name); - snprintf(sc->syn.name + len, sizeof(sc->syn.name) - len, "Yamaha OPL%d", - sc->model); + snprintf(sc->syn.name + len, sizeof(sc->syn.name) - len, + "Yamaha OPL%d", sc->model); sc->syn.data = sc; sc->syn.nvoice = sc->model == OPL_2 ? OPL2_NVOICE : OPL3_NVOICE; sc->syn.lock = sc->lock; diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c index e182c37eb7a..01bb2e0354b 100644 --- a/sys/dev/ic/smc91cxx.c +++ b/sys/dev/ic/smc91cxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: smc91cxx.c,v 1.92 2016/06/10 13:27:14 ozaki-r Exp $ */ +/* $NetBSD: smc91cxx.c,v 1.93 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.92 2016/06/10 13:27:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.93 2016/07/07 06:55:41 msaitoh Exp $"); #include "opt_inet.h" @@ -318,7 +318,8 @@ smc91cxx_attach(struct smc91cxx_softc *sc, u_int8_t *myea) sc->sc_mii.mii_readreg = smc91cxx_mii_readreg; sc->sc_mii.mii_writereg = smc91cxx_mii_writereg; sc->sc_mii.mii_statchg = smc91cxx_statchg; - ifmedia_init(ifm, IFM_IMASK, smc91cxx_mediachange, smc91cxx_mediastatus); + ifmedia_init(ifm, IFM_IMASK, smc91cxx_mediachange, + smc91cxx_mediastatus); SMC_SELECT_BANK(sc, 1); tmp = bus_space_read_2(bst, bsh, CONFIG_REG_W); diff --git a/sys/dev/isa/adv_isa.c b/sys/dev/isa/adv_isa.c index a4295ccd57a..8719b7f9224 100644 --- a/sys/dev/isa/adv_isa.c +++ b/sys/dev/isa/adv_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: adv_isa.c,v 1.20 2012/10/27 17:18:23 chs Exp $ */ +/* $NetBSD: adv_isa.c,v 1.21 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.20 2012/10/27 17:18:23 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.21 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -237,7 +237,8 @@ adv_isa_attach(device_t parent, device_t self, void *aux) } if ((error = isa_dmacascade(ic, ia->ia_drq[0].ir_drq)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to cascade DRQ, error = %d\n", error); + aprint_error_dev(sc->sc_dev, + "unable to cascade DRQ, error = %d\n", error); return; } diff --git a/sys/dev/midi.c b/sys/dev/midi.c index ed3c5b0e79e..ec5acf8ecec 100644 --- a/sys/dev/midi.c +++ b/sys/dev/midi.c @@ -1,4 +1,4 @@ -/* $NetBSD: midi.c,v 1.83 2014/12/30 07:28:34 mrg Exp $ */ +/* $NetBSD: midi.c,v 1.84 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.83 2014/12/30 07:28:34 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.84 2016/07/07 06:55:41 msaitoh Exp $"); #include "midi.h" #include "sequencer.h" @@ -317,7 +317,7 @@ midi_attach(struct midi_softc *sc) aprint_normal(": %s\n", mi.name); if (!pmf_device_register(sc->dev, NULL, NULL)) - aprint_error_dev(sc->dev, "couldn't establish power handler\n"); + aprint_error_dev(sc->dev, "couldn't establish power handler\n"); } void diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c index 0dc3c359b95..37632c37331 100644 --- a/sys/dev/mii/acphy.c +++ b/sys/dev/mii/acphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: acphy.c,v 1.24 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: acphy.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.24 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -126,8 +126,7 @@ acphyattach(device_t parent, device_t self, void *aux) * XXX Check MCR_FX_SEL to set MIIF_HAVE_FIBER? */ - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(sc->mii_dev, ""); #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c index 8afae2ae9b8..a5926d103dd 100644 --- a/sys/dev/mii/bmtphy.c +++ b/sys/dev/mii/bmtphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: bmtphy.c,v 1.31 2014/06/16 14:43:22 msaitoh Exp $ */ +/* $NetBSD: bmtphy.c,v 1.32 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.31 2014/06/16 14:43:22 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.32 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -151,8 +151,7 @@ bmtphyattach(device_t parent, device_t self, void *aux) * XXX Check AUX_STS_FX_MODE to set MIIF_HAVE_FIBER? */ - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c index 1d37ea68333..6b7ff633128 100644 --- a/sys/dev/mii/ciphy.c +++ b/sys/dev/mii/ciphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ciphy.c,v 1.25 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: ciphy.c,v 1.26 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2004 @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.25 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.26 2016/07/07 06:55:41 msaitoh Exp $"); /* * Driver for the Cicada CS8201 10/100/1000 copper PHY. @@ -132,8 +132,7 @@ ciphyattach(device_t parent, device_t self, void *aux) ciphy_reset(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); aprint_normal_dev(self, ""); diff --git a/sys/dev/mii/dmphy.c b/sys/dev/mii/dmphy.c index 8aae3e04c76..27170b9b054 100644 --- a/sys/dev/mii/dmphy.c +++ b/sys/dev/mii/dmphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: dmphy.c,v 1.35 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: dmphy.c,v 1.36 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.35 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.36 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -138,8 +138,7 @@ dmphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index df950d634be..1ed249d7883 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: exphy.c,v 1.53 2013/06/09 09:15:51 msaitoh Exp $ */ +/* $NetBSD: exphy.c,v 1.54 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.53 2013/06/09 09:15:51 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.54 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,8 +139,7 @@ exphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error_dev(self, "no media present\n"); else { diff --git a/sys/dev/mii/glxtphy.c b/sys/dev/mii/glxtphy.c index 7811293576f..eff3bba3660 100644 --- a/sys/dev/mii/glxtphy.c +++ b/sys/dev/mii/glxtphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: glxtphy.c,v 1.24 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: glxtphy.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.24 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -135,8 +135,7 @@ glxtphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); diff --git a/sys/dev/mii/gphyter.c b/sys/dev/mii/gphyter.c index f9ed7004d98..bcd75894391 100644 --- a/sys/dev/mii/gphyter.c +++ b/sys/dev/mii/gphyter.c @@ -1,4 +1,4 @@ -/* $NetBSD: gphyter.c,v 1.29 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: gphyter.c,v 1.30 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.29 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.30 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,8 +146,7 @@ gphyterattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c index dfddaf858c3..522232fbb58 100644 --- a/sys/dev/mii/icsphy.c +++ b/sys/dev/mii/icsphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: icsphy.c,v 1.49 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: icsphy.c,v 1.50 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.49 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.50 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -142,8 +142,7 @@ icsphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/igphy.c b/sys/dev/mii/igphy.c index 786a11b1392..5cce61af8a7 100644 --- a/sys/dev/mii/igphy.c +++ b/sys/dev/mii/igphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: igphy.c,v 1.25 2015/10/30 07:35:30 msaitoh Exp $ */ +/* $NetBSD: igphy.c,v 1.26 2016/07/07 06:55:41 msaitoh Exp $ */ /* * The Intel copyright applies to the analog register setup, and the @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.25 2015/10/30 07:35:30 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.26 2016/07/07 06:55:41 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_mii.h" @@ -166,8 +166,7 @@ igphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); aprint_normal_dev(self, ""); diff --git a/sys/dev/mii/ihphy.c b/sys/dev/mii/ihphy.c index 6a68b3e482a..38b73251873 100644 --- a/sys/dev/mii/ihphy.c +++ b/sys/dev/mii/ihphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ihphy.c,v 1.8 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: ihphy.c,v 1.9 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.8 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.9 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,8 +139,7 @@ ihphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); aprint_normal_dev(self, ""); diff --git a/sys/dev/mii/ikphy.c b/sys/dev/mii/ikphy.c index 778a54cb2b8..173c135e867 100644 --- a/sys/dev/mii/ikphy.c +++ b/sys/dev/mii/ikphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ikphy.c,v 1.10 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: ikphy.c,v 1.11 2016/07/07 06:55:41 msaitoh Exp $ */ /******************************************************************************* Copyright (c) 2001-2005, Intel Corporation @@ -59,7 +59,7 @@ POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.10 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.11 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -132,8 +132,7 @@ ikphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); aprint_normal_dev(self, ""); diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c index 637b4346405..deb73a0b6dc 100644 --- a/sys/dev/mii/inphy.c +++ b/sys/dev/mii/inphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: inphy.c,v 1.53 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: inphy.c,v 1.54 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.53 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.54 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -144,8 +144,7 @@ inphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c index 8d61294ef5d..b791f2cdcec 100644 --- a/sys/dev/mii/iophy.c +++ b/sys/dev/mii/iophy.c @@ -1,4 +1,4 @@ -/* $NetBSD: iophy.c,v 1.37 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: iophy.c,v 1.38 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.37 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.38 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -133,8 +133,7 @@ iophyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c index c34e99a1295..683433753fe 100644 --- a/sys/dev/mii/lxtphy.c +++ b/sys/dev/mii/lxtphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: lxtphy.c,v 1.49 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: lxtphy.c,v 1.50 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.49 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.50 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,8 +146,7 @@ lxtphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if (sc->mii_flags & MIIF_HAVEFIBER) { diff --git a/sys/dev/mii/makphy.c b/sys/dev/mii/makphy.c index 4dcd6ddd8cd..af3b4dd3f43 100644 --- a/sys/dev/mii/makphy.c +++ b/sys/dev/mii/makphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: makphy.c,v 1.40 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: makphy.c,v 1.41 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.40 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.41 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -189,8 +189,7 @@ makphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); diff --git a/sys/dev/mii/micphy.c b/sys/dev/mii/micphy.c index c9a8b486e98..bd067bbb28d 100644 --- a/sys/dev/mii/micphy.c +++ b/sys/dev/mii/micphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: micphy.c,v 1.3 2014/09/26 08:05:00 ryo Exp $ */ +/* $NetBSD: micphy.c,v 1.4 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: micphy.c,v 1.3 2014/09/26 08:05:00 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: micphy.c,v 1.4 2016/07/07 06:55:41 msaitoh Exp $"); #include "opt_mii.h" @@ -136,8 +136,7 @@ micphyattach(device_t parent, device_t self, void *aux) micphy_fixup(sc, model, rev, parent); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); aprint_normal_dev(self, ""); diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 769c5a13180..4494a73c0dd 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: nsphy.c,v 1.59 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: nsphy.c,v 1.60 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.59 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.60 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -133,8 +133,7 @@ nsphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c index b2b995ad7d8..3af4edcc856 100644 --- a/sys/dev/mii/nsphyter.c +++ b/sys/dev/mii/nsphyter.c @@ -1,4 +1,4 @@ -/* $NetBSD: nsphyter.c,v 1.38 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: nsphyter.c,v 1.39 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.38 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.39 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,8 +146,7 @@ nsphyterattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c index 8d9ca8ade57..09e7f876f6d 100644 --- a/sys/dev/mii/pnaphy.c +++ b/sys/dev/mii/pnaphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: pnaphy.c,v 1.20 2008/11/17 03:04:27 dyoung Exp $ */ +/* $NetBSD: pnaphy.c,v 1.21 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.20 2008/11/17 03:04:27 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.21 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -122,8 +122,7 @@ pnaphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index 27172a61383..0ba7a276e19 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: qsphy.c,v 1.48 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: qsphy.c,v 1.49 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.48 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.49 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -132,8 +132,7 @@ qsphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index 928d508192e..941fe89fc17 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: rlphy.c,v 1.29 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: rlphy.c,v 1.30 2016/07/07 06:55:41 msaitoh Exp $ */ /* $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $ */ /* @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.29 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.30 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -140,8 +140,7 @@ rlphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); aprint_normal_dev(self, ""); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_MEDIAMASK) mii_phy_add_media(sc); aprint_normal("\n"); diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c index d9d7f00d33d..d2a0edd5e54 100644 --- a/sys/dev/mii/sqphy.c +++ b/sys/dev/mii/sqphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: sqphy.c,v 1.50 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: sqphy.c,v 1.51 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.50 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.51 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -143,7 +143,8 @@ sqphyattach(device_t parent, device_t self, void *aux) switch (MII_MODEL(ma->mii_id2)) { case MII_MODEL_SEEQ_84220: sc->mii_funcs = &sqphy_84220_funcs; - aprint_normal_dev(self, "using Seeq 84220 isolate/reset hack\n"); + aprint_normal_dev(self, + "using Seeq 84220 isolate/reset hack\n"); break; default: @@ -152,8 +153,7 @@ sqphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c index c2405820bf7..53e1fc026df 100644 --- a/sys/dev/mii/tqphy.c +++ b/sys/dev/mii/tqphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: tqphy.c,v 1.39 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: tqphy.c,v 1.40 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.39 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.40 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -145,8 +145,7 @@ tqphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; aprint_normal_dev(self, ""); if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0) aprint_error("no media present"); diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c index 7ca8816c871..d62fe2ee4e2 100644 --- a/sys/dev/mii/ukphy.c +++ b/sys/dev/mii/ukphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukphy.c,v 1.48 2015/10/30 07:35:30 msaitoh Exp $ */ +/* $NetBSD: ukphy.c,v 1.49 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.48 2015/10/30 07:35:30 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.49 2016/07/07 06:55:41 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_mii.h" @@ -138,8 +138,7 @@ ukphyattach(device_t parent, device_t self, void *aux) PHY_RESET(sc); - sc->mii_capabilities = - PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); aprint_normal_dev(self, ""); diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c index fcb206f8068..46f41c13b3c 100644 --- a/sys/dev/mii/urlphy.c +++ b/sys/dev/mii/urlphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: urlphy.c,v 1.30 2014/06/16 16:48:16 msaitoh Exp $ */ +/* $NetBSD: urlphy.c,v 1.31 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002 * Shingo WATANABE <nabe@nabechan.org>. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.30 2014/06/16 16:48:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.31 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -119,7 +119,8 @@ urlphy_attach(device_t parent, device_t self, void *aux) sc->mii_flags |= MIIF_NOISOLATE; if (mii->mii_instance != 0) { - aprint_error_dev(self, "ignoring this PHY, non-zero instance\n"); + aprint_error_dev(self, + "ignoring this PHY, non-zero instance\n"); return; } PHY_RESET(sc); diff --git a/sys/dev/pad/pad.c b/sys/dev/pad/pad.c index 812cf0e7917..270b73f9103 100644 --- a/sys/dev/pad/pad.c +++ b/sys/dev/pad/pad.c @@ -1,4 +1,4 @@ -/* $NetBSD: pad.c,v 1.24 2016/02/26 13:17:04 nat Exp $ */ +/* $NetBSD: pad.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.24 2016/02/26 13:17:04 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -122,8 +122,8 @@ static const struct audio_format pad_formats[PAD_NFORMATS] = { extern void padattach(int); -static int pad_add_block(pad_softc_t *, uint8_t *, int); -static int pad_get_block(pad_softc_t *, pad_block_t *, int); +static int pad_add_block(pad_softc_t *, uint8_t *, int); +static int pad_get_block(pad_softc_t *, pad_block_t *, int); dev_type_open(pad_open); dev_type_close(pad_close); @@ -760,7 +760,8 @@ pad_modcmd(modcmd_t cmd, void *arg) return error; } - error = devsw_attach(pad_cd.cd_name, NULL, &bmajor, &pad_cdevsw, &cmajor); + error = devsw_attach(pad_cd.cd_name, NULL, &bmajor, + &pad_cdevsw, &cmajor); if (error) { error = config_cfdata_detach(pad_cfdata); if (error) { diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index a0a6896368c..5d625ecbaed 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: aac_pci.c,v 1.36 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: aac_pci.c,v 1.37 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.36 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.37 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -562,8 +562,7 @@ aac_pci_attach(device_t parent, device_t self, void *aux) m = aac_find_ident(pa); aprint_normal("%s\n", m->prodstr); if (intrstr != NULL) - aprint_normal_dev(self, "interrupting at %s\n", - intrstr); + aprint_normal_dev(self, "interrupting at %s\n", intrstr); sc->sc_hwif = m->hwif; sc->sc_quirks = m->quirks; diff --git a/sys/dev/pci/amr.c b/sys/dev/pci/amr.c index f7d18edd55f..62cdc5ca04b 100644 --- a/sys/dev/pci/amr.c +++ b/sys/dev/pci/amr.c @@ -1,4 +1,4 @@ -/* $NetBSD: amr.c,v 1.59 2015/03/02 15:26:57 christos Exp $ */ +/* $NetBSD: amr.c,v 1.60 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.59 2015/03/02 15:26:57 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.60 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -603,9 +603,9 @@ amr_init(struct amr_softc *amr, const char *intrstr, if (intrstr != NULL) aprint_normal_dev(amr->amr_dv, "interrupting at %s\n", intrstr); - aprint_normal_dev(amr->amr_dv, "firmware %.16s, BIOS %.16s, %dMB RAM\n", - ap->ap_firmware, ap->ap_bios, - le16toh(ap->ap_memsize)); + aprint_normal_dev(amr->amr_dv, + "firmware %.16s, BIOS %.16s, %dMB RAM\n", + ap->ap_firmware, ap->ap_bios, le16toh(ap->ap_memsize)); amr->amr_maxqueuecnt = ap->ap_maxio; @@ -620,17 +620,16 @@ amr_init(struct amr_softc *amr, const char *intrstr, } if (aex->ae_numldrives > __arraycount(aex->ae_drivestate)) { - aprint_error_dev(amr->amr_dv, "Inquiry returned more drives (%d)" - " than the array can handle (%zu)\n", - aex->ae_numldrives, - __arraycount(aex->ae_drivestate)); + aprint_error_dev(amr->amr_dv, "Inquiry returned more " + "drives (%d) than the array can handle (%zu)\n", + aex->ae_numldrives, + __arraycount(aex->ae_drivestate)); aex->ae_numldrives = __arraycount(aex->ae_drivestate); } if (aex->ae_numldrives > AMR_MAX_UNITS) { aprint_error_dev(amr->amr_dv, - "adjust AMR_MAX_UNITS to %d (currently %d)" - "\n", AMR_MAX_UNITS, - amr->amr_numdrives); + "adjust AMR_MAX_UNITS to %d (currently %d)\n", + AMR_MAX_UNITS, amr->amr_numdrives); amr->amr_numdrives = AMR_MAX_UNITS; } else amr->amr_numdrives = aex->ae_numldrives; @@ -668,7 +667,8 @@ amr_init(struct amr_softc *amr, const char *intrstr, } else { ae = amr_enquire(amr, AMR_CMD_ENQUIRY, 0, 0, amr->amr_enqbuf); if (ae == NULL) { - aprint_error_dev(amr->amr_dv, "unsupported controller\n"); + aprint_error_dev(amr->amr_dv, + "unsupported controller\n"); return (-1); } @@ -680,7 +680,8 @@ amr_init(struct amr_softc *amr, const char *intrstr, prodstr = "Series 434"; break; default: - snprintf(sbuf, sizeof(sbuf), "unknown PCI dev (0x%04x)", + snprintf(sbuf, sizeof(sbuf), + "unknown PCI dev (0x%04x)", PCI_PRODUCT(pa->pa_id)); prodstr = sbuf; break; @@ -713,13 +714,13 @@ amr_init(struct amr_softc *amr, const char *intrstr, intrstr); if (ishp) - aprint_normal_dev(amr->amr_dv, "firmware <%c.%02d.%02d>, BIOS <%c.%02d.%02d>" - ", %dMB RAM\n", aa->aa_firmware[2], + aprint_normal_dev(amr->amr_dv, "firmware <%c.%02d.%02d>, " + "BIOS <%c.%02d.%02d>, %dMB RAM\n", aa->aa_firmware[2], aa->aa_firmware[1], aa->aa_firmware[0], aa->aa_bios[2], aa->aa_bios[1], aa->aa_bios[0], aa->aa_memorysize); else - aprint_normal_dev(amr->amr_dv, "firmware <%.4s>, BIOS <%.4s>, %dMB RAM\n", - aa->aa_firmware, aa->aa_bios, + aprint_normal_dev(amr->amr_dv, "firmware <%.4s>, BIOS <%.4s>, " + "%dMB RAM\n", aa->aa_firmware, aa->aa_bios, aa->aa_memorysize); amr->amr_maxqueuecnt = aa->aa_maxio; @@ -728,16 +729,16 @@ amr_init(struct amr_softc *amr, const char *intrstr, * Record state of logical drives. */ if (ae->ae_ldrv.al_numdrives > __arraycount(ae->ae_ldrv.al_size)) { - aprint_error_dev(amr->amr_dv, "Inquiry returned more drives (%d)" - " than the array can handle (%zu)\n", - ae->ae_ldrv.al_numdrives, - __arraycount(ae->ae_ldrv.al_size)); + aprint_error_dev(amr->amr_dv, "Inquiry returned more drives " + "(%d) than the array can handle (%zu)\n", + ae->ae_ldrv.al_numdrives, + __arraycount(ae->ae_ldrv.al_size)); ae->ae_ldrv.al_numdrives = __arraycount(ae->ae_ldrv.al_size); } if (ae->ae_ldrv.al_numdrives > AMR_MAX_UNITS) { - aprint_error_dev(amr->amr_dv, "adjust AMR_MAX_UNITS to %d (currently %d)\n", - ae->ae_ldrv.al_numdrives, - AMR_MAX_UNITS); + aprint_error_dev(amr->amr_dv, + "adjust AMR_MAX_UNITS to %d (currently %d)\n", + ae->ae_ldrv.al_numdrives, AMR_MAX_UNITS); amr->amr_numdrives = AMR_MAX_UNITS; } else amr->amr_numdrives = ae->ae_ldrv.al_numdrives; @@ -773,7 +774,8 @@ amr_shutdown(void *cookie) amr_ccb_free(amr, ac); } if (rv != 0) - aprint_error_dev(amr->amr_dv, "unable to flush cache (%d)\n", rv); + aprint_error_dev(amr->amr_dv, + "unable to flush cache (%d)\n", rv); } } @@ -949,8 +951,8 @@ amr_std_thread(void *cookie) rv = amr_ccb_wait(amr, ac); amr_ccb_unmap(amr, ac); if (rv != 0) { - aprint_error_dev(amr->amr_dv, "enquiry failed (st=%d)\n", - ac->ac_status); + aprint_error_dev(amr->amr_dv, + "enquiry failed (st=%d)\n", ac->ac_status); continue; } amr_ccb_free(amr, ac); @@ -1079,8 +1081,10 @@ amr_ccb_enqueue(struct amr_softc *amr, struct amr_ccb *ac) mutex_spin_exit(&amr->amr_mutex); break; } - SIMPLEQ_REMOVE_HEAD(&amr->amr_ccb_queue, ac_chain.simpleq); - TAILQ_INSERT_TAIL(&amr->amr_ccb_active, ac, ac_chain.tailq); + SIMPLEQ_REMOVE_HEAD(&amr->amr_ccb_queue, + ac_chain.simpleq); + TAILQ_INSERT_TAIL(&amr->amr_ccb_active, ac, + ac_chain.tailq); } mutex_spin_exit(&amr->amr_mutex); } diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 2ee2509ab84..ad3598553e6 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.148 2015/05/24 22:03:02 christos Exp $ */ +/* $NetBSD: auich.c,v 1.149 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.148 2015/05/24 22:03:02 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.149 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -626,7 +626,8 @@ map_done: /* setup audio_format */ if (sc->sc_codectype == AC97_CODEC_TYPE_AUDIO) { - memcpy(sc->sc_audio_formats, auich_audio_formats, sizeof(auich_audio_formats)); + memcpy(sc->sc_audio_formats, auich_audio_formats, + sizeof(auich_audio_formats)); if (!AC97_IS_4CH(sc->codec_if)) AUFMT_INVALIDATE(&sc->sc_audio_formats[AUICH_FORMATS_4CH]); if (!AC97_IS_6CH(sc->codec_if)) @@ -638,17 +639,18 @@ map_done: } } mutex_exit(&sc->sc_lock); - if (0 != auconv_create_encodings(sc->sc_audio_formats, AUICH_AUDIO_NFORMATS, - &sc->sc_encodings)) + if (0 != auconv_create_encodings(sc->sc_audio_formats, + AUICH_AUDIO_NFORMATS, &sc->sc_encodings)) return; - if (0 != auconv_create_encodings(auich_spdif_formats, AUICH_SPDIF_NFORMATS, - &sc->sc_spdif_encodings)) + if (0 != auconv_create_encodings(auich_spdif_formats, + AUICH_SPDIF_NFORMATS, &sc->sc_spdif_encodings)) return; } else { mutex_exit(&sc->sc_lock); - memcpy(sc->sc_modem_formats, auich_modem_formats, sizeof(auich_modem_formats)); - if (0 != auconv_create_encodings(sc->sc_modem_formats, AUICH_MODEM_NFORMATS, - &sc->sc_encodings)) + memcpy(sc->sc_modem_formats, auich_modem_formats, + sizeof(auich_modem_formats)); + if (0 != auconv_create_encodings(sc->sc_modem_formats, + AUICH_MODEM_NFORMATS, &sc->sc_encodings)) return; } diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index 708ef4ad89e..04300a827b7 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $NetBSD: auixp.c,v 1.41 2014/10/18 08:33:28 snj Exp $ */ +/* $NetBSD: auixp.c,v 1.42 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.org> @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.41 2014/10/18 08:33:28 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.42 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/types.h> #include <sys/errno.h> @@ -1189,7 +1189,8 @@ auixp_attach(device_t parent, device_t self, void *aux) /* init chip */ if (auixp_init(sc) == -1) { - aprint_error_dev(sc->sc_dev, "auixp_attach: unable to initialize the card\n"); + aprint_error_dev(sc->sc_dev, + "auixp_attach: unable to initialize the card\n"); return; } diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 3e4472e6390..998be02d6d4 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $NetBSD: autri.c,v 1.52 2014/08/01 16:41:58 joerg Exp $ */ +/* $NetBSD: autri.c,v 1.53 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.52 2014/08/01 16:41:58 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.53 2016/07/07 06:55:41 msaitoh Exp $"); #include "midi.h" @@ -588,7 +588,8 @@ autri_attach(device_t parent, device_t self, void *aux) r = ac97_attach(&codec->host_if, self, &sc->sc_lock); if (r != 0) { - aprint_error_dev(sc->sc_dev, "can't attach codec (error 0x%X)\n", r); + aprint_error_dev(sc->sc_dev, + "can't attach codec (error 0x%X)\n", r); return; } diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index f046fddfab1..93bf4c2b89f 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,6 +1,6 @@ /* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */ -/* $NetBSD: bktr_os.c,v 1.65 2014/07/25 08:10:38 dholland Exp $ */ +/* $NetBSD: bktr_os.c,v 1.66 2016/07/07 06:55:42 msaitoh Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */ /* @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.65 2014/07/25 08:10:38 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.66 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef __FreeBSD__ #include "bktr.h" @@ -1516,8 +1516,7 @@ bktr_attach(device_t parent, device_t self, void *aux) return; } if (intrstr != NULL) - printf("%s: interrupting at %s\n", bktr_name(bktr), - intrstr); + printf("%s: interrupting at %s\n", bktr_name(bktr), intrstr); selinit(&bktr->vbi_select); #endif /* __NetBSD__ */ diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index e020e2344e8..962c1f94e7d 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: cmpci.c,v 1.47 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: cmpci.c,v 1.48 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.47 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.48 2016/07/07 06:55:41 msaitoh Exp $"); #if defined(AUDIO_DEBUG) || defined(DEBUG) #define DPRINTF(x) if (cmpcidebug) printf x @@ -461,7 +461,7 @@ cmpci_attach(device_t parent, device_t self, void *aux) cmpci_mixerreg_write(sc, CMPCI_SB16_MIXER_OUTMIX, CMPCI_SB16_SW_CD|CMPCI_SB16_SW_MIC | CMPCI_SB16_SW_LINE); for (i = 0; i < CMPCI_NDEVS; i++) { - switch(i) { + switch (i) { /* * CMI8738 defaults are * master: 0xe0 (0x00 - 0xf8) diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index 8a50409f4a9..36adfcf1a40 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4280.c,v 1.68 2014/09/21 15:07:19 christos Exp $ */ +/* $NetBSD: cs4280.c,v 1.69 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.68 2014/09/21 15:07:19 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.69 2016/07/07 06:55:41 msaitoh Exp $"); #include "midi.h" @@ -112,7 +112,8 @@ static bool cs4280_resume(device_t, const pmf_qual_t *); static bool cs4280_suspend(device_t, const pmf_qual_t *); /* Internal functions */ -static const struct cs4280_card_t * cs4280_identify_card(const struct pci_attach_args *); +static const struct cs4280_card_t * cs4280_identify_card( + const struct pci_attach_args *); static int cs4280_piix4_match(const struct pci_attach_args *); static void cs4280_clkrun_hack(struct cs428x_softc *, int); static void cs4280_clkrun_hack_init(struct cs428x_softc *); diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index ed74e530e44..25140e1dcfe 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4281.c,v 1.51 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: cs4281.c,v 1.52 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.51 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.52 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -97,17 +97,17 @@ static int cs4281_trigger_input(void *, void *, void *, int, void (*)(void *), void *, const audio_params_t *); -static int cs4281_reset_codec(void *); +static int cs4281_reset_codec(void *); /* Internal functions */ -static uint8_t cs4281_sr2regval(int); -static void cs4281_set_dac_rate(struct cs428x_softc *, int); -static void cs4281_set_adc_rate(struct cs428x_softc *, int); +static uint8_t cs4281_sr2regval(int); +static void cs4281_set_dac_rate(struct cs428x_softc *, int); +static void cs4281_set_adc_rate(struct cs428x_softc *, int); static int cs4281_init(struct cs428x_softc *, int); /* Power Management */ -static bool cs4281_suspend(device_t, const pmf_qual_t *); -static bool cs4281_resume(device_t, const pmf_qual_t *); +static bool cs4281_suspend(device_t, const pmf_qual_t *); +static bool cs4281_resume(device_t, const pmf_qual_t *); static const struct audio_hw_if cs4281_hw_if = { NULL, /* open */ diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c index ea5730d69c1..4ba7190f588 100644 --- a/sys/dev/pci/cy_pci.c +++ b/sys/dev/pci/cy_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: cy_pci.c,v 1.24 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: cy_pci.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $ */ /* * cy_pci.c @@ -10,7 +10,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.24 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -115,7 +115,8 @@ cy_pci_attach(device_t parent, device_t self, void *aux) if (pci_mapreg_map(pa, 0x18, cp->cp_memtype, 0, &sc->sc_memt, &sc->sc_bsh, NULL, NULL) != 0) { - aprint_error_dev(sc->sc_dev,"unable to map device registers\n"); + aprint_error_dev(sc->sc_dev, + "unable to map device registers\n"); return; } diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index 5dc08cea80a..c3916f67560 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $NetBSD: cz.c,v 1.61 2014/11/15 19:18:19 christos Exp $ */ +/* $NetBSD: cz.c,v 1.62 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.61 2014/11/15 19:18:19 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.62 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -354,17 +354,16 @@ cz_attach(device_t parent, device_t self, void *aux) aprint_error("\n"); /* We will fall-back on polling mode. */ } else - aprint_normal_dev(cz->cz_dev, "interrupting at %s\n", - intrstr); + aprint_normal_dev(cz->cz_dev, "interrupting at %s\n", intrstr); polling_mode: if (cz->cz_ih == NULL) { callout_init(&cz->cz_callout, 0); if (cz_timeout_ticks == 0) cz_timeout_ticks = max(1, hz * CZ_POLL_MS / 1000); - aprint_normal_dev(cz->cz_dev, "polling mode, %d ms interval (%d tick%s)\n", - CZ_POLL_MS, cz_timeout_ticks, - cz_timeout_ticks == 1 ? "" : "s"); + aprint_normal_dev(cz->cz_dev, + "polling mode, %d ms interval (%d tick%s)\n", CZ_POLL_MS, + cz_timeout_ticks, cz_timeout_ticks == 1 ? "" : "s"); } /* diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index e085852c5f9..87d681be136 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $NetBSD: eap.c,v 1.95 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: eap.c,v 1.96 2016/07/07 06:55:41 msaitoh Exp $ */ /* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */ /* @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.95 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.96 2016/07/07 06:55:41 msaitoh Exp $"); #include "midi.h" #include "joy_eap.h" @@ -635,8 +635,8 @@ eap_attach(device_t parent, device_t self, void *aux) ctl.dev = EAP_INPUT_SOURCE; ctl.type = AUDIO_MIXER_SET; ctl.un.mask = 1 << EAP_VOICE_VOL | 1 << EAP_FM_VOL | - 1 << EAP_CD_VOL | 1 << EAP_LINE_VOL | 1 << EAP_AUX_VOL | - 1 << EAP_MIC_VOL; + 1 << EAP_CD_VOL | 1 << EAP_LINE_VOL | + 1 << EAP_AUX_VOL | 1 << EAP_MIC_VOL; eap_hw_if->set_port(&sc->sc_ei[EAP_I1], &ctl); ctl.type = AUDIO_MIXER_VALUE; diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index bce09dcc932..ddff0a10b11 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $NetBSD: emuxki.c,v 1.63 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: emuxki.c,v 1.64 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc. @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.63 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.64 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -456,9 +456,11 @@ emuxki_attach(device_t parent, device_t self, void *aux) sc->sc_type = EMUXKI_AUDIGY; if (PCI_REVISION(pa->pa_class) == 0x04) { sc->sc_type |= EMUXKI_AUDIGY2; - strlcpy(sc->sc_audv.name, "Audigy2", sizeof sc->sc_audv.name); + strlcpy(sc->sc_audv.name, "Audigy2", + sizeof sc->sc_audv.name); } else { - strlcpy(sc->sc_audv.name, "Audigy", sizeof sc->sc_audv.name); + strlcpy(sc->sc_audv.name, "Audigy", + sizeof sc->sc_audv.name); } } else if (pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG) == EMU_SUBSYS_APS) { diff --git a/sys/dev/pci/esm.c b/sys/dev/pci/esm.c index 76306c4fb81..67f6ef38d2b 100644 --- a/sys/dev/pci/esm.c +++ b/sys/dev/pci/esm.c @@ -1,4 +1,4 @@ -/* $NetBSD: esm.c,v 1.58 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: esm.c,v 1.59 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2002, 2003 Matt Fredette @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.58 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.59 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1639,8 +1639,7 @@ esm_attach(device_t parent, device_t self, void *aux) mutex_destroy(&ess->sc_intr_lock); return; } - aprint_normal_dev(ess->sc_dev, "interrupting at %s\n", - intrstr); + aprint_normal_dev(ess->sc_dev, "interrupting at %s\n", intrstr); /* * Setup PCI config registers @@ -1649,8 +1648,7 @@ esm_attach(device_t parent, device_t self, void *aux) /* power up chip */ if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self, pci_activate_null)) && error != EOPNOTSUPP) { - aprint_error_dev(ess->sc_dev, "cannot activate %d\n", - error); + aprint_error_dev(ess->sc_dev, "cannot activate %d\n", error); mutex_destroy(&ess->sc_lock); mutex_destroy(&ess->sc_intr_lock); return; diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index 9303b06bbfb..cabd0cf58cb 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $NetBSD: eso.c,v 1.65 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: eso.c,v 1.66 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.65 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.66 2016/07/07 06:55:41 msaitoh Exp $"); #include "mpu.h" @@ -402,8 +402,7 @@ eso_attach(device_t parent, device_t self, void *aux) mutex_destroy(&sc->sc_intr_lock); return; } - aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", - intrstring); + aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstring); cv_init(&sc->sc_pcv, "esoho"); cv_init(&sc->sc_rcv, "esohi"); diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c index f74a43c0515..47b6960cf70 100644 --- a/sys/dev/pci/fwohci_pci.c +++ b/sys/dev/pci/fwohci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_pci.c,v 1.42 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: fwohci_pci.c,v 1.43 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.42 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.43 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -69,8 +69,7 @@ CFATTACH_DECL_NEW(fwohci_pci, sizeof(struct fwohci_pci_softc), fwohci_pci_match, fwohci_pci_attach, fwohci_pci_detach, NULL); static int -fwohci_pci_match(device_t parent, cfdata_t match, - void *aux) +fwohci_pci_match(device_t parent, cfdata_t match, void *aux) { struct pci_attach_args *pa = (struct pci_attach_args *) aux; @@ -82,7 +81,7 @@ fwohci_pci_match(device_t parent, cfdata_t match, */ if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_APPLE) && (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_PBG3_FW)) - return 0; + return 0; if (PCI_CLASS(pa->pa_class) == PCI_CLASS_SERIALBUS && PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_SERIALBUS_FIREWIRE && PCI_INTERFACE(pa->pa_class) == PCI_INTERFACE_OHCI) @@ -112,8 +111,7 @@ fwohci_pci_attach(device_t parent, device_t self, void *aux) /* Map I/O registers */ if (pci_mapreg_map(pa, PCI_OHCI_MAP_REGISTER, PCI_MAPREG_TYPE_MEM, 0, - &psc->psc_sc.bst, &psc->psc_sc.bsh, - NULL, &psc->psc_sc.bssize)) { + &psc->psc_sc.bst, &psc->psc_sc.bsh, NULL, &psc->psc_sc.bssize)) { aprint_error_dev(self, "can't map OHCI register space\n"); goto fail; } diff --git a/sys/dev/pci/genfb_pci.c b/sys/dev/pci/genfb_pci.c index b7fedb608ab..80ba1ad4dae 100644 --- a/sys/dev/pci/genfb_pci.c +++ b/sys/dev/pci/genfb_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: genfb_pci.c,v 1.37 2014/07/24 21:35:13 riastradh Exp $ */ +/* $NetBSD: genfb_pci.c,v 1.38 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.37 2014/07/24 21:35:13 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.38 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -138,13 +138,16 @@ pci_genfb_attach(device_t parent, device_t self, void *aux) sc->sc_gen.sc_fbsize, BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE, &sc->sc_memh) != 0) { - aprint_error_dev(self, "unable to map the framebuffer\n"); + aprint_error_dev(self, + "unable to map the framebuffer\n"); return; } - sc->sc_gen.sc_fbaddr = bus_space_vaddr(sc->sc_memt, sc->sc_memh); + sc->sc_gen.sc_fbaddr = bus_space_vaddr(sc->sc_memt, + sc->sc_memh); } else aprint_debug("%s: recycling existing fb mapping at %lx\n", - device_xname(sc->sc_gen.sc_dev), (unsigned long)sc->sc_gen.sc_fbaddr); + device_xname(sc->sc_gen.sc_dev), + (unsigned long)sc->sc_gen.sc_fbaddr); /* mmap()able bus ranges */ idx = 0; diff --git a/sys/dev/pci/hdaudio_pci.c b/sys/dev/pci/hdaudio_pci.c index 90f6b6c25c2..01a43040152 100644 --- a/sys/dev/pci/hdaudio_pci.c +++ b/sys/dev/pci/hdaudio_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdaudio_pci.c,v 1.2 2015/07/05 08:14:46 nonaka Exp $ */ +/* $NetBSD: hdaudio_pci.c,v 1.3 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk> @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.2 2015/07/05 08:14:46 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.3 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -60,17 +60,17 @@ struct hdaudio_pci_softc { pcireg_t sc_id; }; -static int hdaudio_pci_match(device_t, cfdata_t, void *); -static void hdaudio_pci_attach(device_t, device_t, void *); -static int hdaudio_pci_detach(device_t, int); -static int hdaudio_pci_rescan(device_t, const char *, const int *); -static void hdaudio_pci_childdet(device_t, device_t); +static int hdaudio_pci_match(device_t, cfdata_t, void *); +static void hdaudio_pci_attach(device_t, device_t, void *); +static int hdaudio_pci_detach(device_t, int); +static int hdaudio_pci_rescan(device_t, const char *, const int *); +static void hdaudio_pci_childdet(device_t, device_t); -static int hdaudio_pci_intr(void *); -static void hdaudio_pci_reinit(struct hdaudio_pci_softc *); +static int hdaudio_pci_intr(void *); +static void hdaudio_pci_reinit(struct hdaudio_pci_softc *); /* power management */ -static bool hdaudio_pci_resume(device_t, const pmf_qual_t *); +static bool hdaudio_pci_resume(device_t, const pmf_qual_t *); CFATTACH_DECL2_NEW( hdaudio_pci, diff --git a/sys/dev/pci/ichsmb.c b/sys/dev/pci/ichsmb.c index 74e4216dbda..b3f8060dde6 100644 --- a/sys/dev/pci/ichsmb.c +++ b/sys/dev/pci/ichsmb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.45 2015/12/10 05:29:41 pgoyette Exp $ */ +/* $NetBSD: ichsmb.c,v 1.46 2016/07/07 06:55:41 msaitoh Exp $ */ /* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.45 2015/12/10 05:29:41 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.46 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -173,7 +173,8 @@ ichsmb_attach(device_t parent, device_t self, void *aux) } else { /* Install interrupt handler */ if (pci_intr_map(pa, &ih) == 0) { - intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, + sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ichsmb_intr, sc); if (sc->sc_ih != NULL) { diff --git a/sys/dev/pci/if_bwi_pci.c b/sys/dev/pci/if_bwi_pci.c index e5408e9c62d..1e5f0b51914 100644 --- a/sys/dev/pci/if_bwi_pci.c +++ b/sys/dev/pci/if_bwi_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bwi_pci.c,v 1.14 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: if_bwi_pci.c,v 1.15 2016/07/07 06:55:41 msaitoh Exp $ */ /* $OpenBSD: if_bwi_pci.c,v 1.6 2008/02/14 22:10:02 brad Exp $ */ /* @@ -24,7 +24,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.14 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.15 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -132,10 +132,8 @@ bwi_pci_attach(device_t parent, device_t self, void *aux) return; } - if (pci_mapreg_map(pa, BWI_PCI_BAR0, - memtype, 0, &sc->sc_mem_bt, &sc->sc_mem_bh, - NULL, &psc->psc_mapsize) != 0) - { + if (pci_mapreg_map(pa, BWI_PCI_BAR0, memtype, 0, &sc->sc_mem_bt, + &sc->sc_mem_bh, NULL, &psc->psc_mapsize) != 0) { aprint_error_dev(self, "could not map mem space\n"); return; } diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c index a1bbe94eb39..b39a27b08c6 100644 --- a/sys/dev/pci/if_dge.c +++ b/sys/dev/pci/if_dge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_dge.c,v 1.44 2016/06/10 13:27:14 ozaki-r Exp $ */ +/* $NetBSD: if_dge.c,v 1.45 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2004, SUNET, Swedish University Computer Network. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.44 2016/06/10 13:27:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.45 2016/07/07 06:55:41 msaitoh Exp $"); @@ -726,7 +726,8 @@ dge_attach(device_t parent, device_t self, void *aux) memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, DGE_PCI_BAR); if (pci_mapreg_map(pa, DGE_PCI_BAR, memtype, 0, &sc->sc_st, &sc->sc_sh, NULL, NULL)) { - aprint_error_dev(sc->sc_dev, "unable to map device registers\n"); + aprint_error_dev(sc->sc_dev, + "unable to map device registers\n"); return; } diff --git a/sys/dev/pci/if_esh_pci.c b/sys/dev/pci/if_esh_pci.c index ff43d4bc6b8..ad54ed72337 100644 --- a/sys/dev/pci/if_esh_pci.c +++ b/sys/dev/pci/if_esh_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_esh_pci.c,v 1.31 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: if_esh_pci.c,v 1.32 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.31 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.32 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -114,10 +114,10 @@ esh_pci_attach(device_t parent, device_t self, void *aux) aprint_naive(": HIPPI controller\n"); if (pci_mapreg_map(pa, MEM_MAP_REG, - PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, - &sc->sc_iot, &sc->sc_ioh, NULL, NULL) != 0) { - aprint_error(": unable to map memory device registers\n"); - return; + PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_iot, + &sc->sc_ioh, NULL, NULL) != 0) { + aprint_error(": unable to map memory device registers\n"); + return; } sc->sc_dev = self; diff --git a/sys/dev/pci/if_mtd_pci.c b/sys/dev/pci/if_mtd_pci.c index dc1df2aaf29..4405a8fa2ac 100644 --- a/sys/dev/pci/if_mtd_pci.c +++ b/sys/dev/pci/if_mtd_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mtd_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_mtd_pci.c,v 1.20 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ /* TODO: Check why in IO space, the MII won't work. Memory mapped works */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.20 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -70,8 +70,8 @@ static struct mtd_pci_device_id mtd_ids[] = { static int mtd_pci_match(device_t, cfdata_t, void *); static void mtd_pci_attach(device_t, device_t, void *); -CFATTACH_DECL_NEW(mtd_pci, sizeof(struct mtd_softc), mtd_pci_match, mtd_pci_attach, - NULL, NULL); +CFATTACH_DECL_NEW(mtd_pci, sizeof(struct mtd_softc), mtd_pci_match, + mtd_pci_attach, NULL, NULL); static int mtd_pci_match(device_t parent, cfdata_t match, void *aux) @@ -115,7 +115,8 @@ mtd_pci_attach(device_t parent, device_t self, void *aux) sc->bus_tag = iot; sc->bus_handle = ioh; } else { - aprint_error_dev(sc->dev, "could not map memory or i/o space\n"); + aprint_error_dev(sc->dev, + "could not map memory or i/o space\n"); return; } sc->dma_tag = pa->pa_dmat; diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c index 9d3af734f38..569f15ddd72 100644 --- a/sys/dev/pci/if_sf_pci.c +++ b/sys/dev/pci/if_sf_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sf_pci.c,v 1.20 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_sf_pci.c,v 1.21 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.20 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.21 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -190,8 +190,7 @@ sf_pci_attach(device_t parent, device_t self, void *aux) /* power up chip */ if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self, NULL)) && error != EOPNOTSUPP) { - aprint_error_dev(self, "cannot activate %d\n", - error); + aprint_error_dev(self, "cannot activate %d\n", error); return; } @@ -212,8 +211,7 @@ sf_pci_attach(device_t parent, device_t self, void *aux) ioh_valid = (pci_mapreg_map(pa, (reg == (PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT)) ? SF_PCI_IOBA : SF_PCI_IOBA - 0x04, - PCI_MAPREG_TYPE_IO, 0, - &iot, &ioh, NULL, NULL) == 0); + PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, NULL) == 0); if (memh_valid) { sc->sc_st = memt; diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c index fc9f6881c31..9f4ff51b7d6 100644 --- a/sys/dev/pci/if_sip.c +++ b/sys/dev/pci/if_sip.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sip.c,v 1.161 2016/06/10 13:27:14 ozaki-r Exp $ */ +/* $NetBSD: if_sip.c,v 1.162 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.161 2016/06/10 13:27:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.162 2016/07/07 06:55:41 msaitoh Exp $"); @@ -1123,8 +1123,8 @@ sipcom_attach(device_t parent, device_t self, void *aux) if ((error = bus_dmamem_alloc(sc->sc_dmat, sizeof(struct sip_control_data), PAGE_SIZE, 0, &sc->sc_seg, 1, &rseg, 0)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to allocate control data, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "unable to allocate control data, error = %d\n", error); sipcom_do_detach(self, SIP_ATTACH_INTR); return; } @@ -1132,23 +1132,25 @@ sipcom_attach(device_t parent, device_t self, void *aux) if ((error = bus_dmamem_map(sc->sc_dmat, &sc->sc_seg, rseg, sizeof(struct sip_control_data), (void **)&sc->sc_control_data, BUS_DMA_COHERENT)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to map control data, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "unable to map control data, error = %d\n", error); sipcom_do_detach(self, SIP_ATTACH_ALLOC_MEM); } if ((error = bus_dmamap_create(sc->sc_dmat, sizeof(struct sip_control_data), 1, sizeof(struct sip_control_data), 0, 0, &sc->sc_cddmamap)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to create control data DMA map, " - "error = %d\n", error); + aprint_error_dev(sc->sc_dev, + "unable to create control data DMA map, error = %d\n", + error); sipcom_do_detach(self, SIP_ATTACH_MAP_MEM); } if ((error = bus_dmamap_load(sc->sc_dmat, sc->sc_cddmamap, sc->sc_control_data, sizeof(struct sip_control_data), NULL, 0)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to load control data DMA map, error = %d\n", + aprint_error_dev(sc->sc_dev, + "unable to load control data DMA map, error = %d\n", error); sipcom_do_detach(self, SIP_ATTACH_CREATE_MAP); } diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index 9a0268ff2a3..1159fe6114e 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ste.c,v 1.47 2016/06/10 13:27:14 ozaki-r Exp $ */ +/* $NetBSD: if_ste.c,v 1.48 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.47 2016/06/10 13:27:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.48 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> @@ -349,8 +349,7 @@ ste_attach(device_t parent, device_t self, void *aux) /* power up chip */ if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self, NULL)) && error != EOPNOTSUPP) { - aprint_error_dev(sc->sc_dev, "cannot activate %d\n", - error); + aprint_error_dev(sc->sc_dev, "cannot activate %d\n", error); return; } @@ -379,31 +378,33 @@ ste_attach(device_t parent, device_t self, void *aux) if ((error = bus_dmamem_alloc(sc->sc_dmat, sizeof(struct ste_control_data), PAGE_SIZE, 0, &seg, 1, &rseg, 0)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to allocate control data, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "unable to allocate control data, error = %d\n", error); goto fail_0; } if ((error = bus_dmamem_map(sc->sc_dmat, &seg, rseg, sizeof(struct ste_control_data), (void **)&sc->sc_control_data, BUS_DMA_COHERENT)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to map control data, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "unable to map control data, error = %d\n", error); goto fail_1; } if ((error = bus_dmamap_create(sc->sc_dmat, sizeof(struct ste_control_data), 1, sizeof(struct ste_control_data), 0, 0, &sc->sc_cddmamap)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to create control data DMA map, " - "error = %d\n", error); + aprint_error_dev(sc->sc_dev, + "unable to create control data DMA map, error = %d\n", + error); goto fail_2; } if ((error = bus_dmamap_load(sc->sc_dmat, sc->sc_cddmamap, sc->sc_control_data, sizeof(struct ste_control_data), NULL, 0)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to load control data DMA map, error = %d\n", + aprint_error_dev(sc->sc_dev, + "unable to load control data DMA map, error = %d\n", error); goto fail_3; } @@ -415,8 +416,9 @@ ste_attach(device_t parent, device_t self, void *aux) if ((error = bus_dmamap_create(sc->sc_dmat, MCLBYTES, STE_NTXFRAGS, MCLBYTES, 0, 0, &sc->sc_txsoft[i].ds_dmamap)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to create tx DMA map %d, " - "error = %d\n", i, error); + aprint_error_dev(sc->sc_dev, + "unable to create tx DMA map %d, error = %d\n", i, + error); goto fail_4; } } @@ -427,8 +429,9 @@ ste_attach(device_t parent, device_t self, void *aux) for (i = 0; i < STE_NRXDESC; i++) { if ((error = bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1, MCLBYTES, 0, 0, &sc->sc_rxsoft[i].ds_dmamap)) != 0) { - aprint_error_dev(sc->sc_dev, "unable to create rx DMA map %d, " - "error = %d\n", i, error); + aprint_error_dev(sc->sc_dev, + "unable to create rx DMA map %d, error = %d\n", i, + error); goto fail_5; } sc->sc_rxsoft[i].ds_mbuf = NULL; @@ -465,7 +468,7 @@ ste_attach(device_t parent, device_t self, void *aux) mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); + ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0,NULL); ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); } else ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); @@ -640,7 +643,8 @@ ste_start(struct ifnet *ifp) MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { printf("%s: unable to allocate Tx " - "cluster\n", device_xname(sc->sc_dev)); + "cluster\n", + device_xname(sc->sc_dev)); m_freem(m); break; } @@ -651,7 +655,8 @@ ste_start(struct ifnet *ifp) m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); if (error) { printf("%s: unable to load Tx buffer, " - "error = %d\n", device_xname(sc->sc_dev), error); + "error = %d\n", device_xname(sc->sc_dev), + error); break; } } @@ -1145,7 +1150,8 @@ ste_reset(struct ste_softc *sc, u_int32_t rstbits) } if (i == STE_TIMEOUT) - printf("%s: reset failed to complete\n", device_xname(sc->sc_dev)); + printf("%s: reset failed to complete\n", + device_xname(sc->sc_dev)); delay(1000); } diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c index e28d1d34641..4f5d1899f37 100644 --- a/sys/dev/pci/if_stge.c +++ b/sys/dev/pci/if_stge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_stge.c,v 1.59 2016/06/10 13:27:14 ozaki-r Exp $ */ +/* $NetBSD: if_stge.c,v 1.60 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.59 2016/06/10 13:27:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.60 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> @@ -431,8 +431,7 @@ stge_attach(device_t parent, device_t self, void *aux) /* power up chip */ if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self, NULL)) && error != EOPNOTSUPP) { - aprint_error_dev(self, "cannot activate %d\n", - error); + aprint_error_dev(self, "cannot activate %d\n", error); return; } /* @@ -461,8 +460,7 @@ stge_attach(device_t parent, device_t self, void *aux) sizeof(struct stge_control_data), PAGE_SIZE, 0, &seg, 1, &rseg, 0)) != 0) { aprint_error_dev(self, - "unable to allocate control data, error = %d\n", - error); + "unable to allocate control data, error = %d\n", error); goto fail_0; } @@ -470,8 +468,7 @@ stge_attach(device_t parent, device_t self, void *aux) sizeof(struct stge_control_data), (void **)&sc->sc_control_data, BUS_DMA_COHERENT)) != 0) { aprint_error_dev(self, - "unable to map control data, error = %d\n", - error); + "unable to map control data, error = %d\n", error); goto fail_1; } diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index 1db1f73dd71..2b90db51961 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ti.c,v 1.97 2016/06/10 13:27:14 ozaki-r Exp $ */ +/* $NetBSD: if_ti.c,v 1.98 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.97 2016/06/10 13:27:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.98 2016/07/07 06:55:41 msaitoh Exp $"); #include "opt_inet.h" @@ -1685,7 +1685,8 @@ ti_attach(device_t parent, device_t self, void *aux) sc->sc_tx_encap = ti_encap_tigon1; sc->sc_tx_eof = ti_txeof_tigon1; if (nolinear == 1) - aprint_error_dev(self, "memory space not mapped linear\n"); + aprint_error_dev(self, + "memory space not mapped linear\n"); break; case TI_HWREV_TIGON_II: @@ -1733,16 +1734,16 @@ ti_attach(device_t parent, device_t self, void *aux) if ((error = bus_dmamem_alloc(sc->sc_dmat, sizeof(struct ti_ring_data), PAGE_SIZE, 0, &dmaseg, 1, &dmanseg, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(sc->sc_dev, "can't allocate ring buffer, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "can't allocate ring buffer, error = %d\n", error); goto fail2; } if ((error = bus_dmamem_map(sc->sc_dmat, &dmaseg, dmanseg, sizeof(struct ti_ring_data), (void **)&sc->ti_rdata, BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { - aprint_error_dev(sc->sc_dev, "can't map ring buffer, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "can't map ring buffer, error = %d\n", error); goto fail2; } @@ -1750,16 +1751,16 @@ ti_attach(device_t parent, device_t self, void *aux) sizeof(struct ti_ring_data), 1, sizeof(struct ti_ring_data), 0, BUS_DMA_NOWAIT, &sc->info_dmamap)) != 0) { - aprint_error_dev(sc->sc_dev, "can't create ring buffer DMA map, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "can't create ring buffer DMA map, error = %d\n", error); goto fail2; } if ((error = bus_dmamap_load(sc->sc_dmat, sc->info_dmamap, sc->ti_rdata, sizeof(struct ti_ring_data), NULL, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(sc->sc_dev, "can't load ring buffer DMA map, error = %d\n", - error); + aprint_error_dev(sc->sc_dev, + "can't load ring buffer DMA map, error = %d\n", error); goto fail2; } diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 994e8665eb3..a7d91a09fd0 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tl.c,v 1.104 2016/06/10 13:27:14 ozaki-r Exp $ */ +/* $NetBSD: if_tl.c,v 1.105 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.104 2016/06/10 13:27:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.105 2016/07/07 06:55:41 msaitoh Exp $"); #undef TLDEBUG #define TL_PRIV_STATS @@ -392,7 +392,8 @@ tl_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, + sizeof(intrbuf)); sc->tl_if.if_softc = sc; sc->tl_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, tl_intr, sc); @@ -1015,8 +1016,8 @@ tl_intr(void *v) if (int_type == 0) return 0; #if defined(TLDEBUG_RX) || defined(TLDEBUG_TX) - printf("%s: interrupt type %x, intr_reg %x\n", device_xname(sc->sc_dev), - int_type, int_reg); + printf("%s: interrupt type %x, intr_reg %x\n", + device_xname(sc->sc_dev), int_type, int_reg); #endif /* disable interrupts */ TL_HR_WRITE(sc, TL_HOST_CMD, HOST_CMD_IntOff); diff --git a/sys/dev/pci/if_tlp_pci.c b/sys/dev/pci/if_tlp_pci.c index e38745e6100..c000d5e370c 100644 --- a/sys/dev/pci/if_tlp_pci.c +++ b/sys/dev/pci/if_tlp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tlp_pci.c,v 1.123 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_tlp_pci.c,v 1.124 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.123 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.124 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -522,8 +522,7 @@ tlp_pci_attach(device_t parent, device_t self, void *aux) /* power up chip */ if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self, NULL)) && error != EOPNOTSUPP) { - aprint_error_dev(self, "cannot activate %d\n", - error); + aprint_error_dev(self, "cannot activate %d\n", error); return; } diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 06980a99003..903a96f8d3d 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vr.c,v 1.117 2016/06/10 13:27:14 ozaki-r Exp $ */ +/* $NetBSD: if_vr.c,v 1.118 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.117 2016/06/10 13:27:14 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.118 2016/07/07 06:55:41 msaitoh Exp $"); @@ -569,8 +569,8 @@ vr_add_rxbuf(struct vr_softc *sc, int i) m_new->m_ext.ext_buf, m_new->m_ext.ext_size, NULL, BUS_DMA_READ|BUS_DMA_NOWAIT); if (error) { - aprint_error_dev(sc->vr_dev, "unable to load rx DMA map %d, error = %d\n", - i, error); + aprint_error_dev(sc->vr_dev, + "unable to load rx DMA map %d, error = %d\n", i, error); panic("vr_add_rxbuf"); /* XXX */ } @@ -1646,14 +1646,16 @@ vr_attach(device_t parent, device_t self, void *aux) if ((error = bus_dmamem_alloc(sc->vr_dmat, sizeof(struct vr_control_data), PAGE_SIZE, 0, &seg, 1, &rseg, 0)) != 0) { - aprint_error_dev(self, "unable to allocate control data, error = %d\n", error); + aprint_error_dev(self, + "unable to allocate control data, error = %d\n", error); goto fail_0; } if ((error = bus_dmamem_map(sc->vr_dmat, &seg, rseg, sizeof(struct vr_control_data), (void **)&sc->vr_control_data, BUS_DMA_COHERENT)) != 0) { - aprint_error_dev(self, "unable to map control data, error = %d\n", error); + aprint_error_dev(self, + "unable to map control data, error = %d\n", error); goto fail_1; } @@ -1661,8 +1663,9 @@ vr_attach(device_t parent, device_t self, void *aux) sizeof(struct vr_control_data), 1, sizeof(struct vr_control_data), 0, 0, &sc->vr_cddmamap)) != 0) { - aprint_error_dev(self, "unable to create control data DMA map, " - "error = %d\n", error); + aprint_error_dev(self, + "unable to create control data DMA map, error = %d\n", + error); goto fail_2; } diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c index 67619abe9ba..c121db349ad 100644 --- a/sys/dev/pci/isp_pci.c +++ b/sys/dev/pci/isp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: isp_pci.c,v 1.117 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: isp_pci.c,v 1.118 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration * All rights reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.117 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.118 2016/07/07 06:55:41 msaitoh Exp $"); #include <dev/ic/isp_netbsd.h> #include <dev/pci/pcireg.h> @@ -497,8 +497,7 @@ isp_pci_attach(device_t parent, device_t self, void *aux) isp->isp_osinfo.dev = self; - ioh_valid = (pci_mapreg_map(pa, IO_MAP_REG, - PCI_MAPREG_TYPE_IO, 0, + ioh_valid = (pci_mapreg_map(pa, IO_MAP_REG, PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, NULL) == 0); mem_type = pci_mapreg_type(pa->pa_pc, pa->pa_tag, MEM_MAP_REG); @@ -1375,10 +1374,13 @@ isp_pci_dmasetup(struct ispsoftc *isp, struct scsipi_xfer *xs, void *arg) flag = BUS_DMA_WRITE; ddir = ISP_TO_DEVICE; } - error = bus_dmamap_load(isp->isp_dmatag, dmap, xs->data, xs->datalen, - NULL, ((xs->xs_control & XS_CTL_NOSLEEP) ? BUS_DMA_NOWAIT : BUS_DMA_WAITOK) | BUS_DMA_STREAMING | flag); + error = bus_dmamap_load(isp->isp_dmatag, dmap, xs->data, + xs->datalen, NULL, ((xs->xs_control & XS_CTL_NOSLEEP) ? + BUS_DMA_NOWAIT : + BUS_DMA_WAITOK) | BUS_DMA_STREAMING | flag); if (error) { - isp_prt(isp, ISP_LOGWARN, "unable to load DMA (%d)", error); + isp_prt(isp, ISP_LOGWARN, "unable to load DMA (%d)", + error); XS_SETERR(xs, HBA_BOTCH); if (error == EAGAIN || error == ENOMEM) { return (CMD_EAGAIN); @@ -1388,10 +1390,12 @@ isp_pci_dmasetup(struct ispsoftc *isp, struct scsipi_xfer *xs, void *arg) } dm_segs = dmap->dm_segs; nsegs = dmap->dm_nsegs; - bus_dmamap_sync(isp->isp_dmatag, dmap, 0, dmap->dm_mapsize, flg2); + bus_dmamap_sync(isp->isp_dmatag, dmap, 0, dmap->dm_mapsize, + flg2); } - if (isp_send_cmd(isp, rq, dm_segs, nsegs, xs->datalen, ddir) != CMD_QUEUED) { + if (isp_send_cmd(isp, rq, dm_segs, nsegs, xs->datalen, ddir) + != CMD_QUEUED) { return (CMD_EAGAIN); } else { return (CMD_QUEUED); diff --git a/sys/dev/pci/ld_virtio.c b/sys/dev/pci/ld_virtio.c index 3724d460703..cc723ba7fb8 100644 --- a/sys/dev/pci/ld_virtio.c +++ b/sys/dev/pci/ld_virtio.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld_virtio.c,v 1.9 2015/10/27 16:03:04 christos Exp $ */ +/* $NetBSD: ld_virtio.c,v 1.10 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2010 Minoura Makoto. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.9 2015/10/27 16:03:04 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.10 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -250,8 +250,7 @@ ld_virtio_attach(device_t parent, device_t self, void *aux) if (vsc->sc_child != NULL) { aprint_normal(": child already attached for %s; " - "something wrong...\n", - device_xname(parent)); + "something wrong...\n", device_xname(parent)); return; } diff --git a/sys/dev/pci/mly.c b/sys/dev/pci/mly.c index f56559c9f44..f17d56bd164 100644 --- a/sys/dev/pci/mly.c +++ b/sys/dev/pci/mly.c @@ -1,4 +1,4 @@ -/* $NetBSD: mly.c,v 1.49 2014/07/25 08:10:38 dholland Exp $ */ +/* $NetBSD: mly.c,v 1.50 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.49 2014/07/25 08:10:38 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.50 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -367,8 +367,7 @@ mly_attach(device_t parent, device_t self, void *aux) } if (intrstr != NULL) - aprint_normal_dev(self, "interrupting at %s\n", - intrstr); + aprint_normal_dev(self, "interrupting at %s\n", intrstr); /* * Take care of interface-specific tasks. @@ -548,8 +547,7 @@ mly_attach(device_t parent, device_t self, void *aux) rv = kthread_create(PRI_NONE, 0, NULL, mly_thread, mly, &mly->mly_thread, "%s", device_xname(self)); if (rv != 0) - aprint_error_dev(self, "unable to create thread (%d)\n", - rv); + aprint_error_dev(self, "unable to create thread (%d)\n", rv); return; bad: diff --git a/sys/dev/pci/mpt_pci.c b/sys/dev/pci/mpt_pci.c index c6ff9832773..d76185ec705 100644 --- a/sys/dev/pci/mpt_pci.c +++ b/sys/dev/pci/mpt_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpt_pci.c,v 1.23 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: mpt_pci.c,v 1.24 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.23 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.24 2016/07/07 06:55:41 msaitoh Exp $"); #include <dev/ic/mpt.h> /* pulls in all headers */ @@ -212,15 +212,15 @@ mpt_pci_attach(device_t parent, device_t self, void *aux) aprint_error("\n"); return; } - aprint_normal_dev(mpt->sc_dev, "interrupting at %s\n", - intrstr); + aprint_normal_dev(mpt->sc_dev, "interrupting at %s\n", intrstr); /* Disable interrupts on the part. */ mpt_disable_ints(mpt); /* Allocate DMA memory. */ if (mpt_dma_mem_alloc(mpt) != 0) { - aprint_error_dev(mpt->sc_dev, "unable to allocate DMA memory\n"); + aprint_error_dev(mpt->sc_dev, + "unable to allocate DMA memory\n"); return; } diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 5193ed34316..69dfed3fa63 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.209 2016/02/17 20:00:15 christos Exp $ */ +/* $NetBSD: pccbb.c,v 1.210 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.209 2016/02/17 20:00:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.210 2016/07/07 06:55:41 msaitoh Exp $"); /* #define CBB_DEBUG @@ -425,7 +425,8 @@ pccbbattach(device_t parent, device_t self, void *aux) PCI_MAPREG_MEM_ADDR(sock_base) != 0xfffffff0) { /* The address must be valid. */ if (pci_mapreg_map(pa, PCI_SOCKBASE, PCI_MAPREG_TYPE_MEM, 0, - &sc->sc_base_memt, &sc->sc_base_memh, &sockbase, &sc->sc_base_size)) { + &sc->sc_base_memt, &sc->sc_base_memh, &sockbase, + &sc->sc_base_size)) { aprint_error_dev(self, "can't map socket base address 0x%lx\n", (unsigned long)sock_base); @@ -1445,7 +1446,8 @@ cb_reset(struct pccbb_softc *sc) */ int reset_duration = (sc->sc_chipset == CB_RX5C47X ? 400 : 50); - u_int32_t bcr = pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_BRIDGE_CONTROL_REG); + u_int32_t bcr = pci_conf_read(sc->sc_pc, sc->sc_tag, + PCI_BRIDGE_CONTROL_REG); aprint_debug("%s: enter bcr %" PRIx32 "\n", __func__, bcr); /* Reset bit Assert (bit 6 at 0x3E) */ @@ -1800,9 +1802,11 @@ pccbb_intr_disestablish(struct pccbb_softc *sc, void *ih) DPRINTF(("pccbb_intr_disestablish: no interrupt handler\n")); /* stop routing PCI intr */ - reg = pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_BRIDGE_CONTROL_REG); + reg = pci_conf_read(sc->sc_pc, sc->sc_tag, + PCI_BRIDGE_CONTROL_REG); reg |= CB_BCR_INTR_IREQ_ENABLE; - pci_conf_write(sc->sc_pc, sc->sc_tag, PCI_BRIDGE_CONTROL_REG, reg); + pci_conf_write(sc->sc_pc, sc->sc_tag, PCI_BRIDGE_CONTROL_REG, + reg); switch (sc->sc_chipset) { case CB_TI113X: @@ -2243,7 +2247,8 @@ pccbb_pcmcia_wait_ready(struct pccbb_softc *sc) pccbb_pcmcia_delay(sc, 100, "pccwr1"); } - printf("pccbb_pcmcia_wait_ready: ready never happened, status=%02x\n", stat); + printf("pccbb_pcmcia_wait_ready: ready never happened, status=%02x\n", + stat); return (EWOULDBLOCK); } @@ -2344,7 +2349,8 @@ pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t pch) #ifdef DIAGNOSTIC reg = Pcic_read(sc, PCIC_IF_STATUS); if ((reg & PCIC_IF_STATUS_POWERACTIVE) == 0) - printf("pccbb_pcmcia_socket_enable: no power, status=%x\n", reg); + printf("pccbb_pcmcia_socket_enable: no power, status=%x\n", + reg); #endif /* wait for the chip to finish initializing */ diff --git a/sys/dev/pci/pciide_common.c b/sys/dev/pci/pciide_common.c index 324aa66e763..ebb84ef39c0 100644 --- a/sys/dev/pci/pciide_common.c +++ b/sys/dev/pci/pciide_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: pciide_common.c,v 1.60 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: pciide_common.c,v 1.61 2016/07/07 06:55:41 msaitoh Exp $ */ /* @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.60 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.61 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -113,7 +113,8 @@ pciide_lookup_product(pcireg_t id, const struct pciide_product_desc *pp) } void -pciide_common_attach(struct pciide_softc *sc, const struct pci_attach_args *pa, const struct pciide_product_desc *pp) +pciide_common_attach(struct pciide_softc *sc, const struct pci_attach_args *pa, + const struct pciide_product_desc *pp) { pci_chipset_tag_t pc = pa->pa_pc; pcitag_t tag = pa->pa_tag; @@ -284,7 +285,8 @@ pciide_chipen(struct pciide_softc *sc, const struct pci_attach_args *pa) } void -pciide_mapregs_compat(const struct pci_attach_args *pa, struct pciide_channel *cp, int compatchan) +pciide_mapregs_compat(const struct pci_attach_args *pa, + struct pciide_channel *cp, int compatchan) { struct pciide_softc *sc = CHAN_TO_PCIIDE(&cp->ata_channel); struct ata_channel *wdc_cp = &cp->ata_channel; @@ -697,7 +699,8 @@ pciide_dma_table_teardown(struct pciide_softc *sc, int channel, int drive) } int -pciide_dma_dmamap_setup(struct pciide_softc *sc, int channel, int drive, void *databuf, size_t datalen, int flags) +pciide_dma_dmamap_setup(struct pciide_softc *sc, int channel, int drive, + void *databuf, size_t datalen, int flags) { int error, seg; struct pciide_channel *cp = &sc->pciide_channels[channel]; @@ -766,7 +769,8 @@ pciide_dma_dmamap_setup(struct pciide_softc *sc, int channel, int drive, void *d } int -pciide_dma_init(void *v, int channel, int drive, void *databuf, size_t datalen, int flags) +pciide_dma_init(void *v, int channel, int drive, void *databuf, size_t datalen, + int flags) { struct pciide_softc *sc = v; int error; @@ -891,8 +895,7 @@ pciide_chansetup(struct pciide_softc *sc, int channel, pcireg_t interface) /* some common code used by several chip channel_map */ void -pciide_mapchan(const struct pci_attach_args *pa, - struct pciide_channel *cp, +pciide_mapchan(const struct pci_attach_args *pa, struct pciide_channel *cp, pcireg_t interface, int (*pci_intr)(void *)) { struct ata_channel *wdc_cp = &cp->ata_channel; @@ -911,7 +914,8 @@ pciide_mapchan(const struct pci_attach_args *pa, * generic code to map the compat intr. */ void -pciide_map_compat_intr(const struct pci_attach_args *pa, struct pciide_channel *cp, int compatchan) +pciide_map_compat_intr(const struct pci_attach_args *pa, + struct pciide_channel *cp, int compatchan) { struct pciide_softc *sc = CHAN_TO_PCIIDE(&cp->ata_channel); @@ -931,7 +935,8 @@ pciide_map_compat_intr(const struct pci_attach_args *pa, struct pciide_channel * } void -pciide_unmap_compat_intr(pci_chipset_tag_t pc, struct pciide_channel *cp, int compatchan) +pciide_unmap_compat_intr(pci_chipset_tag_t pc, struct pciide_channel *cp, + int compatchan) { #ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH struct pciide_softc *sc = CHAN_TO_PCIIDE(&cp->ata_channel); diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c index 890146ac672..3456cb1aac5 100644 --- a/sys/dev/pci/puc.c +++ b/sys/dev/pci/puc.c @@ -1,4 +1,4 @@ -/* $NetBSD: puc.c,v 1.38 2015/05/04 21:21:39 ryo Exp $ */ +/* $NetBSD: puc.c,v 1.39 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1996, 1998, 1999 @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.38 2015/05/04 21:21:39 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.39 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -301,16 +301,16 @@ puc_attach(device_t parent, device_t self, void *aux) sc->sc_bar_mappings[barindex].s - sc->sc_desc->ports[i].offset, &subregion_handle) != 0) { - aprint_error_dev(self, "couldn't get subregion for port %d\n", i); + aprint_error_dev(self, + "couldn't get subregion for port %d\n", i); continue; } paa.h = subregion_handle; #if 0 printf("%s: port %d: %s @ (index %d) 0x%x (0x%lx, 0x%lx)\n", - device_xname(self), paa.port, - puc_port_type_name(paa.type), barindex, (int)paa.a, - (long)paa.t, (long)paa.h); + device_xname(self), paa.port, puc_port_type_name(paa.type), + barindex, (int)paa.a, (long)paa.t, (long)paa.h); #endif locs[PUCCF_PORT] = i; diff --git a/sys/dev/pci/rtsx_pci.c b/sys/dev/pci/rtsx_pci.c index b02e269a157..98061091b1f 100644 --- a/sys/dev/pci/rtsx_pci.c +++ b/sys/dev/pci/rtsx_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtsx_pci.c,v 1.5 2015/11/06 14:22:17 nonaka Exp $ */ +/* $NetBSD: rtsx_pci.c,v 1.6 2016/07/07 06:55:41 msaitoh Exp $ */ /* $OpenBSD: rtsx_pci.c,v 1.7 2014/08/19 17:55:03 phessler Exp $ */ @@ -20,7 +20,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.5 2015/11/06 14:22:17 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.6 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -123,8 +123,8 @@ rtsx_pci_attach(device_t parent, device_t self, void *aux) return; } intrstr = pci_intr_string(pc, sc->sc_pihp[0], intrbuf, sizeof(intrbuf)); - sc->sc_ih = pci_intr_establish(pc, sc->sc_pihp[0], IPL_SDMMC, rtsx_intr, - &sc->sc); + sc->sc_ih = pci_intr_establish(pc, sc->sc_pihp[0], IPL_SDMMC, + rtsx_intr, &sc->sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt\n"); return; diff --git a/sys/dev/pci/trm.c b/sys/dev/pci/trm.c index 9474866a504..f04941e8aa8 100644 --- a/sys/dev/pci/trm.c +++ b/sys/dev/pci/trm.c @@ -1,4 +1,4 @@ -/* $NetBSD: trm.c,v 1.36 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: trm.c,v 1.37 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2002 Izumi Tsutsui. All rights reserved. * @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.36 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.37 2016/07/07 06:55:41 msaitoh Exp $"); /* #define TRM_DEBUG */ #ifdef TRM_DEBUG @@ -438,8 +438,8 @@ trm_attach(device_t parent, device_t self, void *aux) } if (fl != 0) { aprint_verbose_dev(self, "couldn't map MMIO registers, tryion PIO\n"); - if ((fl = pci_mapreg_map(pa, TRM_BAR_PIO, PCI_MAPREG_TYPE_IO, 0, - &iot, &ioh, NULL, NULL)) != 0) { + if ((fl = pci_mapreg_map(pa, TRM_BAR_PIO, PCI_MAPREG_TYPE_IO, + 0, &iot, &ioh, NULL, NULL)) != 0) { aprint_error(": unable to map registers (%d)\n", fl); return; } diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c index 1e5cda9458a..3b7e854e038 100644 --- a/sys/dev/pci/twa.c +++ b/sys/dev/pci/twa.c @@ -1,4 +1,4 @@ -/* $NetBSD: twa.c,v 1.52 2014/09/27 15:44:27 christos Exp $ */ +/* $NetBSD: twa.c,v 1.53 2016/07/07 06:55:41 msaitoh Exp $ */ /* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */ /*- @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.52 2014/09/27 15:44:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.53 2016/07/07 06:55:41 msaitoh Exp $"); //#define TWA_DEBUG @@ -116,8 +116,9 @@ static uint16_t twa_enqueue_aen(struct twa_softc *sc, static void twa_attach(device_t, device_t, void *); static void twa_shutdown(void *); static int twa_init_connection(struct twa_softc *, uint16_t, uint32_t, - uint16_t, uint16_t, uint16_t, uint16_t, uint16_t *, - uint16_t *, uint16_t *, uint16_t *, uint32_t *); + uint16_t, uint16_t, uint16_t, uint16_t, + uint16_t *, uint16_t *, uint16_t *, + uint16_t *, uint32_t *); static int twa_intr(void *); static int twa_match(device_t, cfdata_t, void *); static int twa_reset(struct twa_softc *); @@ -855,14 +856,16 @@ twa_alloc_req_pkts(struct twa_softc *sc, int num_reqs) if ((rv = bus_dmamem_map(sc->twa_dma_tag, &seg, rseg, size, (void **)&sc->twa_cmds, BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { - aprint_error_dev(sc->twa_dv, "unable to map commands, rv = %d\n", rv); + aprint_error_dev(sc->twa_dv, + "unable to map commands, rv = %d\n", rv); return (1); } if ((rv = bus_dmamap_create(sc->twa_dma_tag, size, num_reqs, size, 0, BUS_DMA_NOWAIT, &sc->twa_cmd_map)) != 0) { - aprint_error_dev(sc->twa_dv, "unable to create command DMA map, " + aprint_error_dev(sc->twa_dv, + "unable to create command DMA map, " "rv = %d\n", rv); return (ENOMEM); } @@ -870,13 +873,15 @@ twa_alloc_req_pkts(struct twa_softc *sc, int num_reqs) if ((rv = bus_dmamap_load(sc->twa_dma_tag, sc->twa_cmd_map, sc->twa_cmds, size, NULL, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(sc->twa_dv, "unable to load command DMA map, " - "rv = %d\n", rv); + aprint_error_dev(sc->twa_dv, + "unable to load command DMA map, rv = %d\n", rv); return (1); } if ((uintptr_t)sc->twa_cmds % TWA_ALIGNMENT) { - aprint_error_dev(sc->twa_dv, "DMA map memory not aligned on %d boundary\n", TWA_ALIGNMENT); + aprint_error_dev(sc->twa_dv, + "DMA map memory not aligned on %d boundary\n", + TWA_ALIGNMENT); return (1); } @@ -909,8 +914,9 @@ twa_alloc_req_pkts(struct twa_softc *sc, int num_reqs) if ((rv = bus_dmamap_create(sc->twa_dma_tag, max_xfer, max_segs, 1, 0, BUS_DMA_NOWAIT, &tr->tr_dma_map)) != 0) { - aprint_error_dev(sc->twa_dv, "unable to create command " - "DMA map, rv = %d\n", rv); + aprint_error_dev(sc->twa_dv, + "unable to create command DMA map, " + "rv = %d\n", rv); return (ENOMEM); } /* Insert request into the free queue. */ @@ -945,7 +951,8 @@ twa_recompute_openings(struct twa_softc *sc) * This makes the controller more reliable under load. */ if (total_size > 0) { - openings = (TWA_Q_LENGTH - 2) * td->td_size / total_size; + openings = (TWA_Q_LENGTH - 2) * td->td_size + / total_size; } else openings = 0; @@ -958,7 +965,8 @@ twa_recompute_openings(struct twa_softc *sc) device_xname(sc->twa_dv), unit, openings); #endif if (td->td_dev != NULL) - (*td->td_callbacks->tcb_openings)(td->td_dev, td->td_openings); + (*td->td_callbacks->tcb_openings)(td->td_dev, + td->td_openings); } } @@ -1561,7 +1569,8 @@ twa_attach(device_t parent, device_t self, void *aux) } else { sc->sc_nunits = 0; use_64bit = false; - aprint_error_dev(sc->twa_dv, "product id 0x%02x not recognized\n", + aprint_error_dev(sc->twa_dv, + "product id 0x%02x not recognized\n", PCI_PRODUCT(pa->pa_id)); return; } @@ -1596,8 +1605,7 @@ twa_attach(device_t parent, device_t self, void *aux) } if (intrstr != NULL) - aprint_normal_dev(sc->twa_dv, "interrupting at %s\n", - intrstr); + aprint_normal_dev(sc->twa_dv, "interrupting at %s\n", intrstr); twa_setup(sc); @@ -1610,9 +1618,9 @@ twa_attach(device_t parent, device_t self, void *aux) SYSCTL_DESCR("twa driver information"), NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL) != 0) { - aprint_error_dev(sc->twa_dv, "could not create %s.%s sysctl node\n", - "hw", - device_xname(sc->twa_dv)); + aprint_error_dev(sc->twa_dv, + "could not create %s.%s sysctl node\n", + "hw", device_xname(sc->twa_dv)); return; } if ((i = sysctl_createv(NULL, 0, NULL, NULL, @@ -1621,9 +1629,9 @@ twa_attach(device_t parent, device_t self, void *aux) NULL, 0, __UNCONST(&twaver), 0, CTL_HW, node->sysctl_num, CTL_CREATE, CTL_EOL)) != 0) { - aprint_error_dev(sc->twa_dv, "could not create %s.%s.driver_version sysctl\n", - "hw", - device_xname(sc->twa_dv)); + aprint_error_dev(sc->twa_dv, + "could not create %s.%s.driver_version sysctl\n", + "hw", device_xname(sc->twa_dv)); return; } @@ -1825,8 +1833,7 @@ twa_map_request(struct twa_request *tr) if ((tr->tr_flags & TWA_CMD_DATA_COPY_NEEDED) != 0) { s = splvm(); uvm_km_kmem_free(kmem_va_arena, - (vaddr_t)tr->tr_data, - tr->tr_length); + (vaddr_t)tr->tr_data, tr->tr_length); splx(s); } return (rv); @@ -1838,8 +1845,8 @@ twa_map_request(struct twa_request *tr) if (tr->tr_flags & TWA_CMD_DATA_COPY_NEEDED) { s = splvm(); - uvm_km_kmem_free(kmem_va_arena, (vaddr_t)tr->tr_data, - tr->tr_length); + uvm_km_kmem_free(kmem_va_arena, + (vaddr_t)tr->tr_data, tr->tr_length); splx(s); tr->tr_data = tr->tr_real_data; tr->tr_length = tr->tr_real_length; @@ -2182,9 +2189,8 @@ fw_passthru_done: } if ((error = copyout(sc->twa_aen_queue [event_index], user_buf->pdata, sizeof(struct tw_cl_event_packet))) != 0) - aprint_error_dev(sc->twa_dv, "get_previous: Could not copyout to " - "event_buf. error = %x\n", - error); + aprint_error_dev(sc->twa_dv, "get_previous: Could not " + "copyout to event_buf. error = %x\n", error); (sc->twa_aen_queue[event_index])->retrieved = TWA_AEN_RETRIEVED; break; @@ -2633,7 +2639,8 @@ twa_soft_reset(struct twa_softc *sc) } if (twa_wait_status(sc, TWA_STATUS_MICROCONTROLLER_READY | TWA_STATUS_ATTENTION_INTERRUPT, 30)) { - aprint_error_dev(sc->twa_dv, "no attention interrupt after reset.\n"); + aprint_error_dev(sc->twa_dv, + "no attention interrupt after reset.\n"); return(1); } twa_outl(sc, TWA_CONTROL_REGISTER_OFFSET, @@ -2648,7 +2655,8 @@ twa_soft_reset(struct twa_softc *sc) return(1); } if (twa_find_aen(sc, TWA_AEN_SOFT_RESET)) { - aprint_error_dev(sc->twa_dv, "reset not reported by controller.\n"); + aprint_error_dev(sc->twa_dv, + "reset not reported by controller.\n"); return(1); } status_reg = twa_inl(sc, TWA_STATUS_REGISTER_OFFSET); @@ -2784,7 +2792,8 @@ twa_enqueue_aen(struct twa_softc *sc, struct twa_command_header *cmd_hdr) &sync_time, twa_aen_callback); #ifdef DIAGNOSTIC if (rv != 0) - aprint_error_dev(sc->twa_dv, "unable to sync time with ctlr\n"); + aprint_error_dev(sc->twa_dv, + "unable to sync time with ctlr\n"); #endif break; @@ -2979,7 +2988,8 @@ twa_describe_controller(struct twa_softc *sc) if (rv) { /* some error occurred */ - aprint_error_dev(sc->twa_dv, "failed to fetch version information\n"); + aprint_error_dev(sc->twa_dv, + "failed to fetch version information\n"); goto bail; } @@ -2988,7 +2998,8 @@ twa_describe_controller(struct twa_softc *sc) aprint_normal_dev(sc->twa_dv, "%d ports, Firmware %.16s, BIOS %.16s\n", ports, p[1]->data, p[2]->data); - aprint_verbose_dev(sc->twa_dv, "Monitor %.16s, PCB %.8s, Achip %.8s, Pchip %.8s\n", + aprint_verbose_dev(sc->twa_dv, + "Monitor %.16s, PCB %.8s, Achip %.8s, Pchip %.8s\n", p[3]->data, p[4]->data, p[5]->data, p[6]->data); @@ -3002,8 +3013,8 @@ twa_describe_controller(struct twa_softc *sc) TWA_PARAM_DRIVEMODEL_LENGTH, NULL, &p[8]); if (rv != 0) { - aprint_error_dev(sc->twa_dv, "unable to get drive model for port" - " %d\n", i); + aprint_error_dev(sc->twa_dv, + "unable to get drive model for port %d\n", i); continue; } @@ -3013,7 +3024,7 @@ twa_describe_controller(struct twa_softc *sc) if (rv != 0) { aprint_error_dev(sc->twa_dv, "unable to get drive size" - " for port %d\n", i); + " for port %d\n", i); free(p[8], M_DEVBUF); continue; } @@ -3088,8 +3099,8 @@ twa_check_ctlr_state(struct twa_softc *sc, uint32_t status_reg) last_warning[1] = t1.tv_usec; } if (status_reg & TWA_STATUS_PCI_PARITY_ERROR_INTERRUPT) { - aprint_error_dev(sc->twa_dv, "clearing PCI parity error " - "re-seat/move/replace card.\n"); + aprint_error_dev(sc->twa_dv, "clearing PCI parity " + "error re-seat/move/replace card.\n"); twa_outl(sc, TWA_CONTROL_REGISTER_OFFSET, TWA_CONTROL_CLEAR_PARITY_ERROR); pci_conf_write(sc->pc, sc->tag, @@ -3121,7 +3132,8 @@ twa_check_ctlr_state(struct twa_softc *sc, uint32_t status_reg) TWA_CONTROL_CLEAR_QUEUE_ERROR); } if (status_reg & TWA_STATUS_MICROCONTROLLER_ERROR) { - aprint_error_dev(sc->twa_dv, "micro-controller error\n"); + aprint_error_dev(sc->twa_dv, + "micro-controller error\n"); result = 1; } } diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c index 44717179ae1..76c87c8ede1 100644 --- a/sys/dev/pci/twe.c +++ b/sys/dev/pci/twe.c @@ -1,4 +1,4 @@ -/* $NetBSD: twe.c,v 1.103 2014/07/25 08:10:38 dholland Exp $ */ +/* $NetBSD: twe.c,v 1.104 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.103 2014/07/25 08:10:38 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.104 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -359,8 +359,7 @@ twe_attach(device_t parent, device_t self, void *aux) } if (intrstr != NULL) - aprint_normal_dev(self, "interrupting at %s\n", - intrstr); + aprint_normal_dev(self, "interrupting at %s\n", intrstr); /* * Allocate and initialise the command blocks and CCBs. diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index 2c671794611..64185b35122 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubsec.c,v 1.42 2015/04/13 15:43:43 riastradh Exp $ */ +/* $NetBSD: ubsec.c,v 1.43 2016/07/07 06:55:41 msaitoh Exp $ */ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */ /* $OpenBSD: ubsec.c,v 1.143 2009/03/27 13:31:30 reyk Exp$ */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.42 2015/04/13 15:43:43 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.43 2016/07/07 06:55:41 msaitoh Exp $"); #undef UBSEC_DEBUG @@ -84,7 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.42 2015/04/13 15:43:43 riastradh Exp $") /* * Prototypes and count for the pci_device structure */ -static int ubsec_probe(device_t, cfdata_t, void *); +static int ubsec_probe(device_t, cfdata_t, void *); static void ubsec_attach(device_t, device_t, void *); static int ubsec_detach(device_t, int); static int ubsec_sysctl_init(void); @@ -439,7 +439,8 @@ ubsec_attach(device_t parent, device_t self, void *aux) q = (struct ubsec_q *)malloc(sizeof(struct ubsec_q), M_DEVBUF, M_ZERO|M_NOWAIT); if (q == NULL) { - aprint_error_dev(self, "can't allocate queue buffers\n"); + aprint_error_dev(self, + "can't allocate queue buffers\n"); break; } @@ -527,10 +528,11 @@ ubsec_attach(device_t parent, device_t self, void *aux) #endif skip_rng: if (sc->sc_rnghz) - aprint_normal_dev(self, "random number generator enabled\n"); + aprint_normal_dev(self, + "random number generator enabled\n"); else - aprint_error_dev(self, "WARNING: random number generator " - "disabled\n"); + aprint_error_dev(self, + "WARNING: random number generator disabled\n"); } #endif /* UBSEC_NO_RNG */ @@ -696,7 +698,8 @@ ubsec_intr(void *arg) q = SIMPLEQ_FIRST(&sc->sc_qchip); dmap = q->q_dma; - if ((dmap->d_dma->d_mcr.mcr_flags & htole16(UBS_MCR_DONE)) == 0) + if ((dmap->d_dma->d_mcr.mcr_flags + & htole16(UBS_MCR_DONE)) == 0) break; q = SIMPLEQ_FIRST(&sc->sc_qchip); @@ -822,8 +825,8 @@ ubsec_intr(void *arg) int wkeup = sc->sc_needwakeup & (CRYPTO_SYMQ|CRYPTO_ASYMQ); #ifdef UBSEC_DEBUG if (ubsec_debug) - printf("%s: wakeup crypto (%x)\n", device_xname(sc->sc_dev), - sc->sc_needwakeup); + printf("%s: wakeup crypto (%x)\n", + device_xname(sc->sc_dev), sc->sc_needwakeup); #endif /* UBSEC_DEBUG */ sc->sc_needwakeup &= ~wkeup; crypto_unblock(sc->sc_cid, wkeup); @@ -876,7 +879,8 @@ ubsec_feed(struct ubsec_softc *sc) goto feed1; ubsecstats.hst_totbatch += npkts-1; - if ((stat = READ_REG(sc, BS_STAT)) & (BS_STAT_MCR1_FULL | BS_STAT_DMAERR)) { + if ((stat = READ_REG(sc, BS_STAT)) + & (BS_STAT_MCR1_FULL | BS_STAT_DMAERR)) { if (stat & BS_STAT_DMAERR) { ubsec_totalreset(sc); ubsecstats.hst_dmaerr++; @@ -892,7 +896,8 @@ ubsec_feed(struct ubsec_softc *sc) /* XXX temporary aggregation statistics reporting code */ if (max < npkts) { max = npkts; - printf("%s: new max aggregate %d\n", device_xname(sc->sc_dev), max); + printf("%s: new max aggregate %d\n", device_xname(sc->sc_dev), + max); } #endif /* UBSEC_DEBUG */ @@ -922,7 +927,8 @@ ubsec_feed(struct ubsec_softc *sc) v = ((void *)&q2->q_dma->d_dma->d_mcr); v = (char*)v + (sizeof(struct ubsec_mcr) - sizeof(struct ubsec_mcr_add)); - memcpy(&q->q_dma->d_dma->d_mcradd[i], v, sizeof(struct ubsec_mcr_add)); + memcpy(&q->q_dma->d_dma->d_mcradd[i], v, + sizeof(struct ubsec_mcr_add)); q->q_stacked_mcr[i] = q2; } q->q_dma->d_dma->d_mcr.mcr_pkts = htole16(npkts); @@ -939,7 +945,8 @@ ubsec_feed(struct ubsec_softc *sc) feed1: while (!SIMPLEQ_EMPTY(&sc->sc_queue)) { - if ((stat = READ_REG(sc, BS_STAT)) & (BS_STAT_MCR1_FULL | BS_STAT_DMAERR)) { + if ((stat = READ_REG(sc, BS_STAT)) + & (BS_STAT_MCR1_FULL | BS_STAT_DMAERR)) { if (stat & BS_STAT_DMAERR) { ubsec_totalreset(sc); ubsecstats.hst_dmaerr++; @@ -1164,7 +1171,8 @@ ubsec_freesession(void *arg, u_int64_t tid) #ifdef __FreeBSD__ /* Ugly gratuitous changes to bus_dma */ static void -ubsec_op_cb(void *arg, bus_dma_segment_t *seg, int nsegs, bus_size_t mapsize, int error) +ubsec_op_cb(void *arg, bus_dma_segment_t *seg, int nsegs, bus_size_t mapsize, + int error) { struct ubsec_operand *op = arg; @@ -1414,9 +1422,11 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) #ifdef UBSEC_DEBUG if (ubsec_debug) { printf("mac: skip %d, len %d, inject %d\n", - maccrd->crd_skip, maccrd->crd_len, maccrd->crd_inject); + maccrd->crd_skip, maccrd->crd_len, + maccrd->crd_inject); printf("enc: skip %d, len %d, inject %d\n", - enccrd->crd_skip, enccrd->crd_len, enccrd->crd_inject); + enccrd->crd_skip, enccrd->crd_len, + enccrd->crd_inject); printf("src: skip %d, len %d\n", sskip, stheend); printf("dst: skip %d, len %d\n", dskip, dtheend); printf("ubs: coffset %d, pktlen %d, cpskip %d, cpoffset %d\n", @@ -1528,9 +1538,13 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) } if (q->q_dst_map == NULL) { if (q->q_cached_dst_map == NULL) { - /* XXX: ``what the heck's that'' 0xfff0? */ - if (bus_dmamap_create(sc->sc_dmat, 0xfff0, - UBS_MAX_SCATTER, 0xfff0, 0, BUS_DMA_NOWAIT, + /* + * XXX: ``what the heck's that'' + * 0xfff0? + */ + if (bus_dmamap_create(sc->sc_dmat, + 0xfff0, UBS_MAX_SCATTER, 0xfff0, 0, + BUS_DMA_NOWAIT, &q->q_cached_dst_map) != 0) { ubsecstats.hst_nomap++; err = ENOMEM; @@ -1580,7 +1594,8 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) if ((m->m_flags & M_EXT) == 0) { m_free(m); ubsecstats.hst_nomcl++; - err = sc->sc_nqueue ? ERESTART : ENOMEM; + err = sc->sc_nqueue + ? ERESTART : ENOMEM; goto errout; } len = MCLBYTES; @@ -2094,7 +2109,8 @@ ubsec_callback2(struct ubsec_softc *sc, struct ubsec_q2 *q) bus_dmamap_sync(sc->sc_dmat, rp->rpr_msgout.dma_map, 0, rp->rpr_msgout.dma_map->dm_mapsize, BUS_DMASYNC_POSTREAD); - len = (krp->krp_param[UBS_RSAPRIV_PAR_MSGOUT].crp_nbits + 7) / 8; + len = (krp->krp_param[UBS_RSAPRIV_PAR_MSGOUT].crp_nbits + 7) + / 8; bcopy(rp->rpr_msgout.dma_vaddr, krp->krp_param[UBS_RSAPRIV_PAR_MSGOUT].crp_p, len); @@ -2379,7 +2395,8 @@ ubsec_free_q(struct ubsec_softc *sc, struct ubsec_q *q) if(q->q_stacked_mcr[i]) { q2 = q->q_stacked_mcr[i]; - if ((q2->q_dst_m != NULL) && (q2->q_src_m != q2->q_dst_m)) + if ((q2->q_dst_m != NULL) + && (q2->q_src_m != q2->q_dst_m)) m_freem(q2->q_dst_m); crp = (struct cryptop *)q2->q_crp; @@ -2660,11 +2677,11 @@ ubsec_kprocess_modexp_sw(struct ubsec_softc *sc, struct cryptkop *krp, #ifdef DIAGNOSTIC /* Misaligned output buffer will hang the chip. */ if ((letoh32(mcr->mcr_opktbuf.pb_addr) & 3) != 0) - panic("%s: modexp invalid addr 0x%x", - device_xname(sc->sc_dev), letoh32(mcr->mcr_opktbuf.pb_addr)); + panic("%s: modexp invalid addr 0x%x", device_xname(sc->sc_dev), + letoh32(mcr->mcr_opktbuf.pb_addr)); if ((letoh32(mcr->mcr_opktbuf.pb_len) & 3) != 0) - panic("%s: modexp invalid len 0x%x", - device_xname(sc->sc_dev), letoh32(mcr->mcr_opktbuf.pb_len)); + panic("%s: modexp invalid len 0x%x", device_xname(sc->sc_dev), + letoh32(mcr->mcr_opktbuf.pb_len)); #endif ctx = (struct ubsec_ctx_modexp *)me->me_q.q_ctx.dma_vaddr; @@ -2711,7 +2728,8 @@ errout: if (me->me_q.q_mcr.dma_map != NULL) ubsec_dma_free(sc, &me->me_q.q_mcr); if (me->me_q.q_ctx.dma_map != NULL) { - memset(me->me_q.q_ctx.dma_vaddr, 0, me->me_q.q_ctx.dma_size); + memset(me->me_q.q_ctx.dma_vaddr, 0, + me->me_q.q_ctx.dma_size); ubsec_dma_free(sc, &me->me_q.q_ctx); } if (me->me_M.dma_map != NULL) { @@ -2866,11 +2884,11 @@ ubsec_kprocess_modexp_hw(struct ubsec_softc *sc, struct cryptkop *krp, #ifdef DIAGNOSTIC /* Misaligned output buffer will hang the chip. */ if ((letoh32(mcr->mcr_opktbuf.pb_addr) & 3) != 0) - panic("%s: modexp invalid addr 0x%x", - device_xname(sc->sc_dev), letoh32(mcr->mcr_opktbuf.pb_addr)); + panic("%s: modexp invalid addr 0x%x", device_xname(sc->sc_dev), + letoh32(mcr->mcr_opktbuf.pb_addr)); if ((letoh32(mcr->mcr_opktbuf.pb_len) & 3) != 0) - panic("%s: modexp invalid len 0x%x", - device_xname(sc->sc_dev), letoh32(mcr->mcr_opktbuf.pb_len)); + panic("%s: modexp invalid len 0x%x", device_xname(sc->sc_dev), + letoh32(mcr->mcr_opktbuf.pb_len)); #endif ctx = (struct ubsec_ctx_modexp *)me->me_q.q_ctx.dma_vaddr; @@ -2915,7 +2933,8 @@ errout: if (me->me_q.q_mcr.dma_map != NULL) ubsec_dma_free(sc, &me->me_q.q_mcr); if (me->me_q.q_ctx.dma_map != NULL) { - memset(me->me_q.q_ctx.dma_vaddr, 0, me->me_q.q_ctx.dma_size); + memset(me->me_q.q_ctx.dma_vaddr, 0, + me->me_q.q_ctx.dma_size); ubsec_dma_free(sc, &me->me_q.q_ctx); } if (me->me_M.dma_map != NULL) { @@ -3111,11 +3130,13 @@ errout: if (rp->rpr_q.q_mcr.dma_map != NULL) ubsec_dma_free(sc, &rp->rpr_q.q_mcr); if (rp->rpr_msgin.dma_map != NULL) { - memset(rp->rpr_msgin.dma_vaddr, 0, rp->rpr_msgin.dma_size); + memset(rp->rpr_msgin.dma_vaddr, 0, + rp->rpr_msgin.dma_size); ubsec_dma_free(sc, &rp->rpr_msgin); } if (rp->rpr_msgout.dma_map != NULL) { - memset(rp->rpr_msgout.dma_vaddr, 0, rp->rpr_msgout.dma_size); + memset(rp->rpr_msgout.dma_vaddr, 0, + rp->rpr_msgout.dma_size); ubsec_dma_free(sc, &rp->rpr_msgout); } free(rp, M_DEVBUF); diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index 81f1458ffcc..a726270238c 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: vga_pci.c,v 1.54 2012/01/30 19:41:23 drochner Exp $ */ +/* $NetBSD: vga_pci.c,v 1.55 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.54 2012/01/30 19:41:23 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.55 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -236,9 +236,11 @@ vga_pci_attach(device_t parent, device_t self, void *aux) vga_pci_lookup_quirks(pa), &vga_pci_funcs); #ifdef VGA_POST - psc->sc_posth = vga_post_init(pa->pa_bus, pa->pa_device, pa->pa_function); + psc->sc_posth = vga_post_init(pa->pa_bus, pa->pa_device, + pa->pa_function); if (psc->sc_posth == NULL) - aprint_error_dev(self, "WARNING: could not prepare POST handler\n"); + aprint_error_dev(self, + "WARNING: could not prepare POST handler\n"); #endif /* diff --git a/sys/dev/pci/viomb.c b/sys/dev/pci/viomb.c index c77b901be5a..82d67bc324b 100644 --- a/sys/dev/pci/viomb.c +++ b/sys/dev/pci/viomb.c @@ -1,4 +1,4 @@ -/* $NetBSD: viomb.c,v 1.5 2015/10/27 16:04:19 christos Exp $ */ +/* $NetBSD: viomb.c,v 1.6 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2010 Minoura Makoto. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: viomb.c,v 1.5 2015/10/27 16:04:19 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: viomb.c,v 1.6 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -128,8 +128,7 @@ viomb_attach(device_t parent, device_t self, void *aux) if (vsc->sc_child != NULL) { aprint_normal(": child already attached for %s; " - "something wrong...\n", - device_xname(parent)); + "something wrong...\n", device_xname(parent)); return; } if (balloon_initialized++) { @@ -306,8 +305,8 @@ inflate(struct viomb_softc *sc) uvm_pglistfree(&b->bl_pglist); return 0; } - bus_dmamap_sync(vsc->sc_dmat, b->bl_dmamap, 0, sizeof(uint32_t)*nvpages, - BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(vsc->sc_dmat, b->bl_dmamap, 0, + sizeof(uint32_t)*nvpages, BUS_DMASYNC_PREWRITE); virtio_enqueue(vsc, vq, slot, b->bl_dmamap, true); virtio_enqueue_commit(vsc, vq, slot, true); sc->sc_inflight += nvpages; @@ -404,7 +403,8 @@ deflate(struct viomb_softc *sc) device_xname(sc->sc_dev)); TAILQ_FOREACH_REVERSE(p, &b->bl_pglist, pglist, pageq.queue) { TAILQ_REMOVE(&b->bl_pglist, p, pageq.queue); - TAILQ_INSERT_HEAD(&sc->sc_balloon_pages, p, pageq.queue); + TAILQ_INSERT_HEAD(&sc->sc_balloon_pages, p, + pageq.queue); } return 0; } @@ -413,12 +413,13 @@ deflate(struct viomb_softc *sc) device_xname(sc->sc_dev)); TAILQ_FOREACH_REVERSE(p, &b->bl_pglist, pglist, pageq.queue) { TAILQ_REMOVE(&b->bl_pglist, p, pageq.queue); - TAILQ_INSERT_HEAD(&sc->sc_balloon_pages, p, pageq.queue); + TAILQ_INSERT_HEAD(&sc->sc_balloon_pages, p, + pageq.queue); } return 0; } - bus_dmamap_sync(vsc->sc_dmat, b->bl_dmamap, 0, sizeof(uint32_t)*nvpages, - BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(vsc->sc_dmat, b->bl_dmamap, 0, + sizeof(uint32_t)*nvpages, BUS_DMASYNC_PREWRITE); virtio_enqueue(vsc, vq, slot, b->bl_dmamap, true); virtio_enqueue_commit(vsc, vq, slot, true); sc->sc_inflight -= nvpages; diff --git a/sys/dev/pci/virtio.c b/sys/dev/pci/virtio.c index c116fe1e7bd..2ad831048c4 100644 --- a/sys/dev/pci/virtio.c +++ b/sys/dev/pci/virtio.c @@ -1,4 +1,4 @@ -/* $NetBSD: virtio.c,v 1.14 2016/01/10 03:07:25 christos Exp $ */ +/* $NetBSD: virtio.c,v 1.15 2016/07/07 06:55:41 msaitoh Exp $ */ /* * Copyright (c) 2010 Minoura Makoto. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.14 2016/01/10 03:07:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.15 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -208,7 +208,8 @@ error: } static int -virtio_setup_intx_interrupt(struct virtio_softc *sc, struct pci_attach_args *pa) +virtio_setup_intx_interrupt(struct virtio_softc *sc, + struct pci_attach_args *pa) { device_t self = sc->sc_dev; pci_chipset_tag_t pc = pa->pa_pc; @@ -478,7 +479,8 @@ virtio_reinit_start(struct virtio_softc *sc) /* MSI-X should have more than one handles where INTx has just one */ if (sc->sc_ihs_num > 1) { if (virtio_setup_msix_vectors(sc) != 0) { - aprint_error_dev(sc->sc_dev, "couldn't setup MSI-X vectors\n"); + aprint_error_dev(sc->sc_dev, + "couldn't setup MSI-X vectors\n"); return; } } @@ -747,7 +749,8 @@ virtio_start_vq_intr(struct virtio_softc *sc, struct virtqueue *vq) * Initialize vq structure. */ static void -virtio_init_vq(struct virtio_softc *sc, struct virtqueue *vq, const bool reinit) +virtio_init_vq(struct virtio_softc *sc, struct virtqueue *vq, + const bool reinit) { int i, j; int vq_size = vq->vq_num; @@ -793,9 +796,8 @@ virtio_init_vq(struct virtio_softc *sc, struct virtqueue *vq, const bool reinit) * Allocate/free a vq. */ int -virtio_alloc_vq(struct virtio_softc *sc, - struct virtqueue *vq, int index, int maxsegsize, int maxnsegs, - const char *name) +virtio_alloc_vq(struct virtio_softc *sc, struct virtqueue *vq, int index, + int maxsegsize, int maxnsegs, const char *name) { int vq_size, allocsize1, allocsize2, allocsize3, allocsize = 0; int rsegs, r; diff --git a/sys/dev/pci/weasel_pci.c b/sys/dev/pci/weasel_pci.c index e2ea90efc18..1b6bf4e874b 100644 --- a/sys/dev/pci/weasel_pci.c +++ b/sys/dev/pci/weasel_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: weasel_pci.c,v 1.15 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: weasel_pci.c,v 1.16 2016/07/07 06:55:41 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.15 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.16 2016/07/07 06:55:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -124,26 +124,31 @@ weasel_pci_attach(device_t parent, device_t self, void *aux) bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_STATUS, 0); if ((v = bus_space_read_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_RD)) != OS_RET_PONG) { - aprint_error_dev(self, "unexpected PING response from Weasel: 0x%02x\n", v); + aprint_error_dev(self, + "unexpected PING response from Weasel: 0x%02x\n", v); return; } /* Read the config block. */ if (weasel_issue_command(sc, OS_CMD_SHOW_CONFIG)) { - aprint_error_dev(self, "Weasel didn't respond to SHOW_CONFIG\n"); + aprint_error_dev(self, + "Weasel didn't respond to SHOW_CONFIG\n"); return; } cfg_size = bus_space_read_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_RD); bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_STATUS, 0); if (++cfg_size != sizeof(cfg)) { - aprint_error_dev(self, "weird config block size from Weasel: 0x%03x\n", cfg_size); + aprint_error_dev(self, + "weird config block size from Weasel: 0x%03x\n", cfg_size); return; } for (cp = (uint8_t *) &cfg; cfg_size != 0; cfg_size--) { if (weasel_wait_response(sc)) { - aprint_error_dev(self, "Weasel stopped providing config block(%d)\n", cfg_size); + aprint_error_dev(self, + "Weasel stopped providing config block(%d)\n", + cfg_size); return; } *cp++ = bus_space_read_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_RD); @@ -175,14 +180,15 @@ weasel_pci_attach(device_t parent, device_t self, void *aux) if (vers != NULL) printf("%s: %s mode\n", device_xname(self), mode); else - printf("%s: unknown config version 0x%02x\n", device_xname(self), - cfg.cfg_version); + printf("%s: unknown config version 0x%02x\n", + device_xname(self), cfg.cfg_version); /* * Fetch sw version. */ if (weasel_issue_command(sc, OS_CMD_QUERY_SW_VER)) { - aprint_error_dev(self, "didn't reply to software version query.\n"); + aprint_error_dev(self, + "didn't reply to software version query.\n"); } else { v = bus_space_read_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_RD); @@ -196,8 +202,10 @@ weasel_pci_attach(device_t parent, device_t self, void *aux) printf("%s: Weasel stopped providing version\n", device_xname(self)); } - *cp++ = bus_space_read_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_RD); - bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_STATUS, 0); + *cp++ = bus_space_read_1(sc->sc_st, sc->sc_sh, + WEASEL_DATA_RD); + bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_STATUS, + 0); } printf("%s: sw: %s", device_xname(self), buf); } @@ -206,7 +214,8 @@ weasel_pci_attach(device_t parent, device_t self, void *aux) */ if (weasel_issue_command(sc, OS_CMD_QUERY_L_VER)) { aprint_normal("\n"); - aprint_error_dev(self, "didn't reply to logic version query.\n"); + aprint_error_dev(self, + "didn't reply to logic version query.\n"); } bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_STATUS, 0); v = bus_space_read_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_RD); @@ -216,7 +225,8 @@ weasel_pci_attach(device_t parent, device_t self, void *aux) */ if (weasel_issue_command(sc, OS_CMD_QUERY_VB_VER)) { aprint_normal("\n"); - aprint_error_dev(self, "didn't reply to vga bios version query.\n"); + aprint_error_dev(self, + "didn't reply to vga bios version query.\n"); } v = bus_space_read_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_RD); bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_STATUS, 0); @@ -226,7 +236,8 @@ weasel_pci_attach(device_t parent, device_t self, void *aux) */ if (weasel_issue_command(sc, OS_CMD_QUERY_HW_VER)) { aprint_normal("\n"); - aprint_error_dev(self, "didn't reply to hardware version query.\n"); + aprint_error_dev(self, + "didn't reply to hardware version query.\n"); } v = bus_space_read_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_RD); bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_STATUS, 0); @@ -274,7 +285,8 @@ static int weasel_issue_command(struct weasel_softc *sc, uint8_t cmd) { bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_DATA_WR, cmd); - bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_HOST_STATUS, OS_HS_WEASEL_READ); + bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_HOST_STATUS, + OS_HS_WEASEL_READ); bus_space_write_1(sc->sc_st, sc->sc_sh, WEASEL_STATUS, 0); return (weasel_wait_response(sc)); } diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c index 5d71f2c58f8..d621467b76b 100644 --- a/sys/dev/pcmcia/esp_pcmcia.c +++ b/sys/dev/pcmcia/esp_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp_pcmcia.c,v 1.38 2009/05/12 14:42:18 cegger Exp $ */ +/* $NetBSD: esp_pcmcia.c,v 1.39 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.38 2009/05/12 14:42:18 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.39 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -162,8 +162,7 @@ esp_pcmcia_attach(device_t parent, device_t self, void *aux) error = pcmcia_function_configure(pf, esp_pcmcia_validate_config); if (error) { - aprint_error_dev(self, "configure failed, error=%d\n", - error); + aprint_error_dev(self, "configure failed, error=%d\n", error); return; } diff --git a/sys/dev/pcmcia/if_cs_pcmcia.c b/sys/dev/pcmcia/if_cs_pcmcia.c index 57a2e1f58fa..7854d7fc1c8 100644 --- a/sys/dev/pcmcia/if_cs_pcmcia.c +++ b/sys/dev/pcmcia/if_cs_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_pcmcia.c,v 1.21 2015/04/13 16:33:25 riastradh Exp $ */ +/* $NetBSD: if_cs_pcmcia.c,v 1.22 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c)2001 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.21 2015/04/13 16:33:25 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.22 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -108,8 +108,7 @@ cs_pcmcia_attach(device_t parent, device_t self, void *aux) error = pcmcia_function_configure(pa->pf, cs_pcmcia_validate_config); if (error) { - aprint_error_dev(self, "configure failed, error=%d\n", - error); + aprint_error_dev(self, "configure failed, error=%d\n", error); return; } diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c index faba1ab4d0e..b66b451e69f 100644 --- a/sys/dev/pcmcia/if_ep_pcmcia.c +++ b/sys/dev/pcmcia/if_ep_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_pcmcia.c,v 1.63 2009/09/05 12:31:00 tsutsui Exp $ */ +/* $NetBSD: if_ep_pcmcia.c,v 1.64 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.63 2009/09/05 12:31:00 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.64 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -308,8 +308,8 @@ ep_pcmcia_attach(device_t parent, device_t self, void *aux) break; } - epp = pcmcia_product_lookup(pa, ep_pcmcia_products, ep_pcmcia_nproducts, - sizeof(ep_pcmcia_products[0]), NULL); + epp = pcmcia_product_lookup(pa, ep_pcmcia_products, + ep_pcmcia_nproducts, sizeof(ep_pcmcia_products[0]), NULL); if (!epp) panic("ep_pcmcia_attach: impossible"); diff --git a/sys/dev/pcmcia/if_mbe_pcmcia.c b/sys/dev/pcmcia/if_mbe_pcmcia.c index 4a7675db3d5..a0406c8f16c 100644 --- a/sys/dev/pcmcia/if_mbe_pcmcia.c +++ b/sys/dev/pcmcia/if_mbe_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mbe_pcmcia.c,v 1.46 2009/05/12 14:42:18 cegger Exp $ */ +/* $NetBSD: if_mbe_pcmcia.c,v 1.47 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.46 2009/05/12 14:42:18 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.47 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -141,8 +141,8 @@ mbe_pcmcia_match(device_t parent, cfdata_t cf, void *aux) { struct pcmcia_attach_args *pa = aux; - if (pcmcia_product_lookup(pa, mbe_pcmcia_products, mbe_pcmcia_nproducts, - sizeof(mbe_pcmcia_products[0]), NULL)) + if (pcmcia_product_lookup(pa, mbe_pcmcia_products, + mbe_pcmcia_nproducts, sizeof(mbe_pcmcia_products[0]), NULL)) return 1; return 0; } @@ -151,8 +151,7 @@ int mbe_pcmcia_validate_config(struct pcmcia_config_entry *cfe) { - if (cfe->iftype != PCMCIA_IFTYPE_IO || - cfe->num_iospace < 1) + if (cfe->iftype != PCMCIA_IFTYPE_IO || cfe->num_iospace < 1) return EINVAL; return 0; } @@ -173,8 +172,7 @@ mbe_pcmcia_attach(device_t parent, device_t self, void *aux) error = pcmcia_function_configure(pa->pf, mbe_pcmcia_validate_config); if (error) { - aprint_error_dev(self, "configure failed, error=%d\n", - error); + aprint_error_dev(self, "configure failed, error=%d\n", error); return; } diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c index c9784e4d233..b4cc4c88128 100644 --- a/sys/dev/pcmcia/if_ray.c +++ b/sys/dev/pcmcia/if_ray.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ray.c,v 1.83 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_ray.c,v 1.84 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 Christian E. Hopps @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.83 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.84 2016/07/07 06:55:42 msaitoh Exp $"); #include "opt_inet.h" @@ -510,8 +510,7 @@ ray_attach(device_t parent, device_t self, void *aux) /*XXXmem8|common*/ error = pcmcia_function_configure(pa->pf, ray_validate_config); if (error) { - aprint_error_dev(self, "configure failed, error=%d\n", - error); + aprint_error_dev(self, "configure failed, error=%d\n", error); return; } @@ -570,7 +569,8 @@ ray_attach(device_t parent, device_t self, void *aux) aprint_normal_dev(self, "firmware version %d\n", sc->sc_version); if (sc->sc_version != SC_BUILD_4) - aprint_normal_dev(self, "supported rates %0x:%0x:%0x:%0x:%0x:%0x:%0x:%0x\n", + aprint_normal_dev(self, + "supported rates %0x:%0x:%0x:%0x:%0x:%0x:%0x:%0x\n", ep->e_rates[0], ep->e_rates[1], ep->e_rates[2], ep->e_rates[3], ep->e_rates[4], ep->e_rates[5], ep->e_rates[6], ep->e_rates[7]); @@ -670,8 +670,7 @@ ray_enable(struct ray_softc *sc) RAY_DPRINTF(("%s: enable\n", device_xname(sc->sc_dev))); - sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET, - ray_intr, sc); + sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET, ray_intr, sc); if (!sc->sc_ih) return (EIO); @@ -821,13 +820,15 @@ ray_reset(struct ray_softc *sc) { if (++sc->sc_resetloop >= RAY_MAX_RESETS) { if (sc->sc_resetloop == RAY_MAX_RESETS) { - aprint_error_dev(sc->sc_dev, "unable to correct, disabling\n"); + aprint_error_dev(sc->sc_dev, + "unable to correct, disabling\n"); callout_stop(&sc->sc_reset_resetloop_ch); callout_reset(&sc->sc_disable_ch, 1, (void (*)(void *))ray_disable, sc); } } else { - aprint_error_dev(sc->sc_dev, "unexpected failure resetting hw [%d more]\n", + aprint_error_dev(sc->sc_dev, + "unexpected failure resetting hw [%d more]\n", RAY_MAX_RESETS - sc->sc_resetloop); callout_stop(&sc->sc_reset_resetloop_ch); ray_init(sc); @@ -1150,7 +1151,8 @@ ray_intr_start(struct ray_softc *sc) tmplen = sizeof(struct ieee80211_frame); } else if (et > ETHERMTU) { /* adjust for LLC/SNAP header */ - tmplen = sizeof(struct ieee80211_frame) - ETHER_ADDR_LEN; + tmplen = sizeof(struct ieee80211_frame) + - ETHER_ADDR_LEN; } else { tmplen = 0; } @@ -1244,8 +1246,8 @@ ray_intr_start(struct ray_softc *sc) pcount++; m_freem(m0); - RAY_DPRINTF_XMIT(("%s: sent packet: len %ld\n", device_xname(sc->sc_dev), - (u_long)pktlen)); + RAY_DPRINTF_XMIT(("%s: sent packet: len %ld\n", + device_xname(sc->sc_dev), (u_long)pktlen)); } if (firsti == RAY_CCS_LINK_NULL) @@ -1258,14 +1260,16 @@ ray_intr_start(struct ray_softc *sc) * be a confused state though because we check above * and don't issue any commands between. */ - printf("%s: dropping tx packets device busy\n", device_xname(sc->sc_dev)); + printf("%s: dropping tx packets device busy\n", + device_xname(sc->sc_dev)); ray_free_ccs_chain(sc, firsti); ifp->if_oerrors += pcount; return; } /* send it off */ - RAY_DPRINTF(("%s: ray_start issuing %d \n", device_xname(sc->sc_dev), firsti)); + RAY_DPRINTF(("%s: ray_start issuing %d \n", device_xname(sc->sc_dev), + firsti)); SRAM_WRITE_1(sc, RAY_SCB_CCSI, firsti); RAY_ECF_START_CMD(sc); @@ -1294,8 +1298,7 @@ ray_recv(struct ray_softc *sc, bus_size_t ccs) #ifdef RAY_DEBUG /* have a look if you want to see how the card rx works :) */ if (ray_debug && ray_debug_dump_desc) - hexdump((char *)sc->sc_memh + RAY_RCS_BASE, 0x400, - 16, 4, 0); + hexdump((char *)sc->sc_memh + RAY_RCS_BASE, 0x400, 16, 4, 0); #endif m = 0; @@ -1322,8 +1325,8 @@ ray_recv(struct ray_softc *sc, bus_size_t ccs) RAY_DPRINTF(("%s: recv pktlen %ld frag %d\n", device_xname(sc->sc_dev), (u_long)pktlen, frag)); - RAY_DPRINTF_XMIT(("%s: received packet: len %ld\n", device_xname(sc->sc_dev), - (u_long)pktlen)); + RAY_DPRINTF_XMIT(("%s: received packet: len %ld\n", + device_xname(sc->sc_dev), (u_long)pktlen)); if (pktlen > MCLBYTES || pktlen < sizeof(*frame)) { RAY_DPRINTF(("%s: PKTLEN TOO BIG OR TOO SMALL\n", device_xname(sc->sc_dev))); @@ -1340,7 +1343,8 @@ ray_recv(struct ray_softc *sc, bus_size_t ccs) /* XXX should allow chaining? */ MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { - RAY_DPRINTF(("%s: MCLGET FAILED\n", device_xname(sc->sc_dev))); + RAY_DPRINTF(("%s: MCLGET FAILED\n", + device_xname(sc->sc_dev))); ifp->if_ierrors++; m_freem(m); m = 0; @@ -1353,7 +1357,8 @@ ray_recv(struct ray_softc *sc, bus_size_t ccs) m->m_data += fudge; d = mtod(m, u_int8_t *); - RAY_DPRINTF(("%s: recv ccs index %d\n", device_xname(sc->sc_dev), first)); + RAY_DPRINTF(("%s: recv ccs index %d\n", device_xname(sc->sc_dev), + first)); i = ni = first; while ((i = ni) && i != RAY_CCS_LINK_NULL) { ccs = RAY_GET_CCS(i); @@ -1368,8 +1373,8 @@ ray_recv(struct ray_softc *sc, bus_size_t ccs) ni = SRAM_READ_FIELD_1(sc, ccs, ray_cmd_rx, c_nextfrag); RAY_DPRINTF(( "%s: recv frag index %d len %ld bufp 0x%llx ni %d\n", - device_xname(sc->sc_dev), i, (u_long)len, (unsigned long long)bufp, - ni)); + device_xname(sc->sc_dev), i, (u_long)len, + (unsigned long long)bufp, ni)); if (len + lenread > pktlen) { RAY_DPRINTF(("%s: BAD LEN current 0x%lx pktlen 0x%lx\n", device_xname(sc->sc_dev), (u_long)(len + lenread), @@ -1392,14 +1397,16 @@ ray_recv(struct ray_softc *sc, bus_size_t ccs) else { /* wrapping */ ray_read_region(sc, bufp, d, (tmp = RAY_RX_END - bufp)); - ray_read_region(sc, RAY_RX_BASE, d + tmp, ebufp - RAY_RX_END); + ray_read_region(sc, RAY_RX_BASE, d + tmp, + ebufp - RAY_RX_END); } d += len; lenread += len; } done: - RAY_DPRINTF(("%s: recv frag count %d\n", device_xname(sc->sc_dev), frag)); + RAY_DPRINTF(("%s: recv frag count %d\n", device_xname(sc->sc_dev), + frag)); /* free the rcss */ ni = first; @@ -1492,7 +1499,8 @@ done: m_freem(m); return; default: - RAY_DPRINTF(("%s: pkt type unknown\n", device_xname(sc->sc_dev))); + RAY_DPRINTF(("%s: pkt type unknown\n", + device_xname(sc->sc_dev))); m_freem(m); return; } @@ -1529,7 +1537,8 @@ ray_recv_auth(struct ray_softc *sc, struct ieee80211_frame *frame) u_int8_t *var = (u_int8_t *)(frame + 1); if (sc->sc_mode == SC_MODE_ADHOC) { - RAY_DPRINTF(("%s: recv auth packet:\n", device_xname(sc->sc_dev))); + RAY_DPRINTF(("%s: recv auth packet:\n", + device_xname(sc->sc_dev))); #ifdef RAY_DEBUG hexdump((const u_int8_t *)frame, sizeof(*frame) + 6, 16, 4, 0); #endif @@ -1673,7 +1682,8 @@ ray_update_params_done(struct ray_softc *sc, bus_size_t ccs, u_int stat) /* this will get more complex as we add commands */ if (stat == RAY_CCS_STATUS_FAIL) { - printf("%s: failed to update a promisc\n", device_xname(sc->sc_dev)); + printf("%s: failed to update a promisc\n", + device_xname(sc->sc_dev)); /* XXX should probably reset */ /* rcmd = ray_reset; */ } @@ -1681,8 +1691,8 @@ ray_update_params_done(struct ray_softc *sc, bus_size_t ccs, u_int stat) if (sc->sc_running & SCP_UPD_PROMISC) { ray_cmd_done(sc, SCP_UPD_PROMISC); sc->sc_promisc = SRAM_READ_1(sc, RAY_HOST_TO_ECF_BASE); - RAY_DPRINTF(("%s: new promisc value %d\n", device_xname(sc->sc_dev), - sc->sc_promisc)); + RAY_DPRINTF(("%s: new promisc value %d\n", + device_xname(sc->sc_dev), sc->sc_promisc)); } else if (sc->sc_updreq) { ray_cmd_done(sc, SCP_UPD_UPDATEPARAMS); /* get the update parameter */ @@ -1710,7 +1720,8 @@ ray_check_scheduled(void *arg) sc = arg; RAY_DPRINTF(( "%s: ray_check_scheduled enter schd 0x%x running 0x%x ready %d\n", - device_xname(sc->sc_dev), sc->sc_scheduled, sc->sc_running, RAY_ECF_READY(sc))); + device_xname(sc->sc_dev), sc->sc_scheduled, sc->sc_running, + RAY_ECF_READY(sc))); if (sc->sc_timoneed) { callout_stop(&sc->sc_check_scheduled_ch); @@ -1733,7 +1744,8 @@ ray_check_scheduled(void *arg) RAY_DPRINTF(( "%s: ray_check_scheduled exit sched 0x%x running 0x%x ready %d\n", - device_xname(sc->sc_dev), sc->sc_scheduled, sc->sc_running, RAY_ECF_READY(sc))); + device_xname(sc->sc_dev), sc->sc_scheduled, sc->sc_running, + RAY_ECF_READY(sc))); if (sc->sc_scheduled & ~SCP_UPD_MASK) ray_set_pending(sc, sc->sc_scheduled); @@ -1852,7 +1864,8 @@ ray_ccs_done(struct ray_softc *sc, bus_size_t ccs) stat = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_status); RAY_DPRINTF(("%s: ray_ccs_done idx %llu cmd 0x%x stat %u\n", - device_xname(sc->sc_dev), (unsigned long long)RAY_GET_INDEX(ccs), cmd, stat)); + device_xname(sc->sc_dev), (unsigned long long)RAY_GET_INDEX(ccs), + cmd, stat)); rcmd = 0; switch (cmd) { @@ -1951,7 +1964,8 @@ ray_rccs_intr(struct ray_softc *sc, bus_size_t ccs) stat = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_status); RAY_DPRINTF(("%s: ray_rccs_intr idx %llu cmd 0x%x stat %u\n", - device_xname(sc->sc_dev), (unsigned long long)RAY_GET_INDEX(ccs), cmd, stat)); + device_xname(sc->sc_dev), (unsigned long long)RAY_GET_INDEX(ccs), + cmd, stat)); rcmd = 0; switch (cmd) { @@ -2022,7 +2036,8 @@ ray_intr(void *arg) else if (i <= RAY_RCCS_LAST) rcmd = ray_rccs_intr(sc, RAY_GET_CCS(i)); else - printf("%s: intr: bad cmd index %d\n", device_xname(sc->sc_dev), i); + printf("%s: intr: bad cmd index %d\n", + device_xname(sc->sc_dev), i); } if (rcmd) @@ -2031,7 +2046,8 @@ ray_intr(void *arg) if (count) REG_WRITE(sc, RAY_HCSIR, 0); - RAY_DPRINTF(("%s: interrupt handled %d\n", device_xname(sc->sc_dev), count)); + RAY_DPRINTF(("%s: interrupt handled %d\n", device_xname(sc->sc_dev), + count)); return (count ? 1 : 0); } @@ -2131,11 +2147,13 @@ ray_alloc_ccs(struct ray_softc *sc, bus_size_t *ccsp, u_int cmd, u_int track) static void ray_set_pending(struct ray_softc *sc, u_int cmdf) { - RAY_DPRINTF(("%s: ray_set_pending 0x%x\n", device_xname(sc->sc_dev), cmdf)); + RAY_DPRINTF(("%s: ray_set_pending 0x%x\n", device_xname(sc->sc_dev), + cmdf)); sc->sc_scheduled |= cmdf; if (!sc->sc_timoneed) { - RAY_DPRINTF(("%s: ray_set_pending new timo\n", device_xname(sc->sc_dev))); + RAY_DPRINTF(("%s: ray_set_pending new timo\n", + device_xname(sc->sc_dev))); callout_reset(&sc->sc_check_scheduled_ch, RAY_CHECK_SCHED_TIMEOUT, ray_check_scheduled, sc); sc->sc_timoneed = 1; @@ -2150,7 +2168,8 @@ ray_cmd_schedule(struct ray_softc *sc, int cmdf) { int track; - RAY_DPRINTF(("%s: ray_cmd_schedule 0x%x\n", device_xname(sc->sc_dev), cmdf)); + RAY_DPRINTF(("%s: ray_cmd_schedule 0x%x\n", device_xname(sc->sc_dev), + cmdf)); track = cmdf; if ((cmdf & SCP_UPD_MASK) == 0) @@ -2168,7 +2187,8 @@ ray_cmd_schedule(struct ray_softc *sc, int cmdf) static int ray_cmd_is_scheduled(struct ray_softc *sc, int cmdf) { - RAY_DPRINTF(("%s: ray_cmd_is_scheduled 0x%x\n", device_xname(sc->sc_dev), cmdf)); + RAY_DPRINTF(("%s: ray_cmd_is_scheduled 0x%x\n", + device_xname(sc->sc_dev), cmdf)); return ((sc->sc_scheduled & cmdf) ? 1 : 0); } @@ -2179,7 +2199,8 @@ ray_cmd_is_scheduled(struct ray_softc *sc, int cmdf) static void ray_cmd_cancel(struct ray_softc *sc, int cmdf) { - RAY_DPRINTF(("%s: ray_cmd_cancel 0x%x\n", device_xname(sc->sc_dev), cmdf)); + RAY_DPRINTF(("%s: ray_cmd_cancel 0x%x\n", device_xname(sc->sc_dev), + cmdf)); sc->sc_scheduled &= ~cmdf; if ((cmdf & SCP_UPD_MASK) && (sc->sc_scheduled & SCP_UPD_MASK) == 0) @@ -2198,7 +2219,8 @@ ray_cmd_cancel(struct ray_softc *sc, int cmdf) static void ray_cmd_ran(struct ray_softc *sc, int cmdf) { - RAY_DPRINTF(("%s: ray_cmd_ran 0x%x\n", device_xname(sc->sc_dev), cmdf)); + RAY_DPRINTF(("%s: ray_cmd_ran 0x%x\n", device_xname(sc->sc_dev), + cmdf)); if (cmdf & SCP_UPD_MASK) sc->sc_running |= cmdf | SCP_UPDATESUBCMD; @@ -2218,7 +2240,8 @@ ray_cmd_ran(struct ray_softc *sc, int cmdf) static int ray_cmd_is_running(struct ray_softc *sc, int cmdf) { - RAY_DPRINTF(("%s: ray_cmd_is_running 0x%x\n", device_xname(sc->sc_dev), cmdf)); + RAY_DPRINTF(("%s: ray_cmd_is_running 0x%x\n", device_xname(sc->sc_dev), + cmdf)); return ((sc->sc_running & cmdf) ? 1 : 0); } @@ -2229,7 +2252,8 @@ ray_cmd_is_running(struct ray_softc *sc, int cmdf) static void ray_cmd_done(struct ray_softc *sc, int cmdf) { - RAY_DPRINTF(("%s: ray_cmd_done 0x%x\n", device_xname(sc->sc_dev), cmdf)); + RAY_DPRINTF(("%s: ray_cmd_done 0x%x\n", device_xname(sc->sc_dev), + cmdf)); sc->sc_running &= ~cmdf; if (cmdf & SCP_UPD_MASK) { @@ -2252,7 +2276,8 @@ ray_issue_cmd(struct ray_softc *sc, bus_size_t ccs, u_int track) { u_int i; - RAY_DPRINTF(("%s: ray_cmd_issue 0x%x\n", device_xname(sc->sc_dev), track)); + RAY_DPRINTF(("%s: ray_cmd_issue 0x%x\n", device_xname(sc->sc_dev), + track)); /* * XXX other drivers did this, but I think @@ -2630,7 +2655,8 @@ ray_start_join_timo(void *arg) * marked busy. */ static ray_cmd_func_t -ray_start_join_net_done(struct ray_softc *sc, u_int cmd, bus_size_t ccs, u_int stat) +ray_start_join_net_done(struct ray_softc *sc, u_int cmd, bus_size_t ccs, + u_int stat) { int i; struct ray_net_params np; @@ -2708,8 +2734,9 @@ ray_start_join_net_done(struct ray_softc *sc, u_int cmd, bus_size_t ccs, u_int s return (ray_start_join_net); } RAY_DPRINTF(("%s: net start/join nwid %.32s bssid %s inited %d\n", - device_xname(sc->sc_dev), sc->sc_cnwid.i_nwid, ether_sprintf(sc->sc_bssid), - SRAM_READ_FIELD_1(sc, ccs, ray_cmd_net, c_inited))); + device_xname(sc->sc_dev), sc->sc_cnwid.i_nwid, + ether_sprintf(sc->sc_bssid), + SRAM_READ_FIELD_1(sc, ccs, ray_cmd_net, c_inited))); /* network is now active */ ray_cmd_schedule(sc, SCP_UPD_MCAST|SCP_UPD_PROMISC); diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c index 997fea3bd3c..f11dd966431 100644 --- a/sys/dev/pcmcia/if_sm_pcmcia.c +++ b/sys/dev/pcmcia/if_sm_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sm_pcmcia.c,v 1.55 2012/10/27 17:18:37 chs Exp $ */ +/* $NetBSD: if_sm_pcmcia.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 1997, 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.55 2012/10/27 17:18:37 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,8 +146,7 @@ sm_pcmcia_attach(device_t parent, device_t self, void *aux) error = pcmcia_function_configure(pa->pf, sm_pcmcia_validate_config); if (error) { - aprint_error_dev(self, "configure failed, error=%d\n", - error); + aprint_error_dev(self, "configure failed, error=%d\n", error); return; } @@ -171,7 +170,8 @@ sm_pcmcia_attach(device_t parent, device_t self, void *aux) } else { if (!sm_pcmcia_ascii_enaddr(pa->pf->sc->card.cis1_info[3], enaddr) && !sm_pcmcia_ascii_enaddr(pa->pf->sc->card.cis1_info[2], enaddr)) - aprint_error_dev(self, "unable to get Ethernet address\n"); + aprint_error_dev(self, + "unable to get Ethernet address\n"); } /* Perform generic intialization. */ diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 98ac8cbf539..cafcc44ca48 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wi_pcmcia.c,v 1.91 2016/06/01 23:37:33 pgoyette Exp $ */ +/* $NetBSD: if_wi_pcmcia.c,v 1.92 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.91 2016/06/01 23:37:33 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.92 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,8 +82,10 @@ static int wi_pcmcia_enable(device_t, int); #if WI_PCMCIA_SPECTRUM24T_FW /* support to download firmware for symbol CF card */ -static int wi_pcmcia_load_firm(struct wi_softc *, const void *, int, const void *, int); -static int wi_pcmcia_write_firm(struct wi_softc *, const void *, int, const void *, int); +static int wi_pcmcia_load_firm(struct wi_softc *, const void *, int, + const void *, int); +static int wi_pcmcia_write_firm(struct wi_softc *, const void *, int, + const void *, int); static int wi_pcmcia_set_hcr(struct wi_softc *, int); #endif @@ -340,8 +342,7 @@ wi_pcmcia_attach(device_t parent, device_t self, void *aux) error = pcmcia_function_configure(pa->pf, wi_pcmcia_validate_config); if (error) { - aprint_error_dev(self, "configure failed, error=%d\n", - error); + aprint_error_dev(self, "configure failed, error=%d\n", error); return; } diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 3939fdf3871..5b5e84b9b73 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_aue.c,v 1.136 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_aue.c,v 1.137 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.136 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.137 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -775,7 +775,8 @@ aue_attach(device_t parent, device_t self, void *aux) "creating multicast configuration thread\n"); return; } - sc->aue_flags = aue_lookup(uaa->uaa_vendor, uaa->uaa_product)->aue_flags; + sc->aue_flags = aue_lookup(uaa->uaa_vendor, + uaa->uaa_product)->aue_flags; sc->aue_udev = dev; sc->aue_iface = iface; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 6da02f3d643..fd6ac1ab70b 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_kue.c,v 1.85 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_kue.c,v 1.86 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.85 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.86 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -512,8 +512,7 @@ kue_attach(device_t parent, device_t self, void *aux) sc->kue_attached = true; splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->kue_udev, - sc->kue_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->kue_udev, sc->kue_dev); return; } diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index b8747cc8197..19a2c319465 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ -/* $NetBSD: if_rum.c,v 1.55 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_rum.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.55 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/sockio.h> @@ -479,8 +479,7 @@ rum_attach(device_t parent, device_t self, void *aux) ieee80211_announce(ic); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index d5c362d7c7c..33ebf5066d3 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_udav.c,v 1.47 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_udav.c,v 1.48 2016/07/07 06:55:42 msaitoh Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.47 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.48 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -85,12 +85,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.47 2016/06/10 13:27:15 ozaki-r Exp $") /* Function declarations */ -int udav_match(device_t, cfdata_t, void *); -void udav_attach(device_t, device_t, void *); -int udav_detach(device_t, int); -int udav_activate(device_t, enum devact); +int udav_match(device_t, cfdata_t, void *); +void udav_attach(device_t, device_t, void *); +int udav_detach(device_t, int); +int udav_activate(device_t, enum devact); extern struct cfdriver udav_cd; -CFATTACH_DECL_NEW(udav, sizeof(struct udav_softc), udav_match, udav_attach, udav_detach, udav_activate); +CFATTACH_DECL_NEW(udav, sizeof(struct udav_softc), udav_match, udav_attach, + udav_detach, udav_activate); Static int udav_openpipes(struct udav_softc *); Static int udav_rx_list_init(struct udav_softc *); @@ -217,7 +218,8 @@ udav_attach(device_t parent, device_t self, void *aux) usb_init_task(&sc->sc_tick_task, udav_tick_task, sc, 0); mutex_init(&sc->sc_mii_lock, MUTEX_DEFAULT, IPL_NONE); - usb_init_task(&sc->sc_stop_task, (void (*)(void *))udav_stop_task, sc, 0); + usb_init_task(&sc->sc_stop_task, (void (*)(void *))udav_stop_task, sc, + 0); /* get control interface */ err = usbd_device2interface_handle(dev, UDAV_IFACE_INDEX, &iface); @@ -229,7 +231,8 @@ udav_attach(device_t parent, device_t self, void *aux) sc->sc_udev = dev; sc->sc_ctl_iface = iface; - sc->sc_flags = udav_lookup(uaa->uaa_vendor, uaa->uaa_product)->udav_flags; + sc->sc_flags = udav_lookup(uaa->uaa_vendor, + uaa->uaa_product)->udav_flags; /* get interface descriptor */ id = usbd_get_interface_descriptor(sc->sc_ctl_iface); @@ -381,8 +384,7 @@ udav_detach(device_t self, int flags) splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); mutex_destroy(&sc->sc_mii_lock); @@ -937,8 +939,8 @@ udav_rx_list_init(struct udav_softc *sc) if (udav_newbuf(sc, c, NULL) == ENOBUFS) return ENOBUFS; if (c->udav_xfer == NULL) { - int error = usbd_create_xfer(sc->sc_pipe_rx, UDAV_BUFSZ, - USBD_SHORT_XFER_OK, 0, &c->udav_xfer); + int error = usbd_create_xfer(sc->sc_pipe_rx, + UDAV_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->udav_xfer); if (error) return error; c->udav_buf = usbd_get_buffer(c->udav_xfer); diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 4a401d47592..800f21dc894 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_upl.c,v 1.55 2016/06/22 10:44:31 knakahara Exp $ */ +/* $NetBSD: if_upl.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.55 2016/06/22 10:44:31 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.56 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -171,12 +171,13 @@ Static struct upl_type sc_devs[] = { { 0, 0 } }; -int upl_match(device_t, cfdata_t, void *); -void upl_attach(device_t, device_t, void *); -int upl_detach(device_t, int); -int upl_activate(device_t, enum devact); +int upl_match(device_t, cfdata_t, void *); +void upl_attach(device_t, device_t, void *); +int upl_detach(device_t, int); +int upl_activate(device_t, enum devact); extern struct cfdriver upl_cd; -CFATTACH_DECL_NEW(upl, sizeof(struct upl_softc), upl_match, upl_attach, upl_detach, upl_activate); +CFATTACH_DECL_NEW(upl, sizeof(struct upl_softc), upl_match, upl_attach, + upl_detach, upl_activate); Static int upl_openpipes(struct upl_softc *); Static int upl_tx_list_init(struct upl_softc *); @@ -316,8 +317,7 @@ upl_attach(device_t parent, device_t self, void *aux) sc->sc_attached = 1; splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; } @@ -357,8 +357,7 @@ upl_detach(device_t self, int flags) sc->sc_attached = 0; splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c index 279e2b1979e..c3b999a0513 100644 --- a/sys/dev/usb/if_ural.c +++ b/sys/dev/usb/if_ural.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ural.c,v 1.49 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_ural.c,v 1.50 2016/07/07 06:55:42 msaitoh Exp $ */ /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */ /*- @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.49 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.50 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/sockio.h> @@ -343,12 +343,13 @@ static const struct { { 161, 0x08808, 0x0242f, 0x00281 } }; -int ural_match(device_t, cfdata_t, void *); -void ural_attach(device_t, device_t, void *); -int ural_detach(device_t, int); -int ural_activate(device_t, enum devact); +int ural_match(device_t, cfdata_t, void *); +void ural_attach(device_t, device_t, void *); +int ural_detach(device_t, int); +int ural_activate(device_t, enum devact); extern struct cfdriver ural_cd; -CFATTACH_DECL_NEW(ural, sizeof(struct ural_softc), ural_match, ural_attach, ural_detach, ural_activate); +CFATTACH_DECL_NEW(ural, sizeof(struct ural_softc), ural_match, ural_attach, + ural_detach, ural_activate); int ural_match(device_t parent, cfdata_t match, void *aux) @@ -520,8 +521,7 @@ ural_attach(device_t parent, device_t self, void *aux) ieee80211_announce(ic); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -552,8 +552,7 @@ ural_detach(device_t self, int flags) splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index bab346b7b4b..ad373c28062 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_url.c,v 1.52 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_url.c,v 1.53 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002 @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.52 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.53 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -86,12 +86,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.52 2016/06/10 13:27:15 ozaki-r Exp $"); /* Function declarations */ -int url_match(device_t, cfdata_t, void *); -void url_attach(device_t, device_t, void *); -int url_detach(device_t, int); -int url_activate(device_t, enum devact); +int url_match(device_t, cfdata_t, void *); +void url_attach(device_t, device_t, void *); +int url_detach(device_t, int); +int url_activate(device_t, enum devact); extern struct cfdriver url_cd; -CFATTACH_DECL_NEW(url, sizeof(struct url_softc), url_match, url_attach, url_detach, url_activate); +CFATTACH_DECL_NEW(url, sizeof(struct url_softc), url_match, url_attach, + url_detach, url_activate); Static int url_openpipes(struct url_softc *); Static int url_rx_list_init(struct url_softc *); @@ -380,8 +381,7 @@ url_detach(device_t self, int flags) splx(s); rw_destroy(&sc->sc_mii_rwlock); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 2dae3ebe881..a992fc4979f 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ -/* $NetBSD: if_zyd.c,v 1.41 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: if_zyd.c,v 1.42 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.41 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.42 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/sockio.h> @@ -485,8 +485,7 @@ zyd_detach(device_t self, int flags) splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c index 72bdbe40150..8f29b0c77fb 100644 --- a/sys/dev/usb/moscom.c +++ b/sys/dev/usb/moscom.c @@ -1,4 +1,4 @@ -/* $NetBSD: moscom.c,v 1.9 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: moscom.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $ */ /* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.9 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -267,8 +267,7 @@ moscom_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_arg = sc; ucaa.ucaa_info = NULL; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); @@ -295,8 +294,7 @@ moscom_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/pseye.c b/sys/dev/usb/pseye.c index 0fdd72bd688..165ea9ec05c 100644 --- a/sys/dev/usb/pseye.c +++ b/sys/dev/usb/pseye.c @@ -1,4 +1,4 @@ -/* $NetBSD: pseye.c,v 1.22 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: pseye.c,v 1.23 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.22 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.23 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -266,8 +266,7 @@ pseye_attach(device_t parent, device_t self, void *opaque) return; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - self); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, self); } @@ -309,8 +308,7 @@ pseye_detach(device_t self, int flags) cv_destroy(&sc->sc_cv); mutex_destroy(&sc->sc_mtx); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/slurm.c b/sys/dev/usb/slurm.c index fa20b7013fc..d2e06715c71 100644 --- a/sys/dev/usb/slurm.c +++ b/sys/dev/usb/slurm.c @@ -1,4 +1,4 @@ -/* $NetBSD: slurm.c,v 1.2 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: slurm.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2012 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.2 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -154,8 +154,7 @@ slurm_detach(device_t self, int flags) if ((rv = config_detach_children(self, flags)) != 0) return rv; - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (rv); } diff --git a/sys/dev/usb/stuirda.c b/sys/dev/usb/stuirda.c index ec0281ea3ea..f0322854f94 100644 --- a/sys/dev/usb/stuirda.c +++ b/sys/dev/usb/stuirda.c @@ -1,4 +1,4 @@ -/* $NetBSD: stuirda.c,v 1.17 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: stuirda.c,v 1.18 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001,2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.17 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.18 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> @@ -96,12 +96,13 @@ struct irframe_methods stuirda_methods = { #define stuirda_activate uirda_activate #define stuirda_detach uirda_detach -int stuirda_match(device_t, cfdata_t, void *); -void stuirda_attach(device_t, device_t, void *); -int stuirda_detach(device_t, int); -int stuirda_activate(device_t, enum devact); +int stuirda_match(device_t, cfdata_t, void *); +void stuirda_attach(device_t, device_t, void *); +int stuirda_detach(device_t, int); +int stuirda_activate(device_t, enum devact); extern struct cfdriver stuirda_cd; -CFATTACH_DECL_NEW(stuirda, sizeof(struct stuirda_softc), stuirda_match, stuirda_attach, stuirda_detach, stuirda_activate); +CFATTACH_DECL_NEW(stuirda, sizeof(struct stuirda_softc), stuirda_match, + stuirda_attach, stuirda_detach, stuirda_activate); int stuirda_match(device_t parent, cfdata_t match, void *aux) @@ -131,7 +132,8 @@ stuirda_attach(device_t parent, device_t self, void *aux) } int -stuirda_fwload(struct uirda_softc *sc) { +stuirda_fwload(struct uirda_softc *sc) +{ int rc; diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index cbf2c2ad446..3b30692971e 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -1,4 +1,4 @@ -/* $NetBSD: uark.c,v 1.7 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uark.c,v 1.8 2016/07/07 06:55:42 msaitoh Exp $ */ /* $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */ /* @@ -183,8 +183,7 @@ uark_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_arg = sc; ucaa.ucaa_info = NULL; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); @@ -204,8 +203,7 @@ uark_detach(device_t self, int flags) sc->sc_subdev = NULL; } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 91173cd6efd..6b71f304336 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: uaudio.c,v 1.146 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uaudio.c,v 1.147 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1999, 2012 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.146 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.147 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -499,8 +499,7 @@ uaudio_attach(device_t parent, device_t self, void *aux) aprint_normal_dev(self, "%d mixer controls\n", sc->sc_nctls); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF("%s", "doing audio_attach_mi\n"); sc->sc_audiodev = audio_attach_mi(&uaudio_hw_if, sc, sc->sc_dev); @@ -544,8 +543,7 @@ uaudio_detach(device_t self, int flags) if (sc->sc_audiodev != NULL) rv = config_detach(sc->sc_audiodev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); if (sc->sc_formats != NULL) kmem_free(sc->sc_formats, diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index dfcea839c7a..1bf75dce495 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubsa.c,v 1.31 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ubsa.c,v 1.32 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. * All rights reserved. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.31 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.32 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,8 +289,7 @@ ubsa_attach(device_t parent, device_t self, void *aux) sc->sc_subdevs[0] = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; @@ -336,8 +335,7 @@ ubsa_detach(device_t self, int flags) rv |= config_detach(sc->sc_subdevs[i], flags); } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (rv); } diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c index bbfb69f55c1..98b65affba3 100644 --- a/sys/dev/usb/ubt.c +++ b/sys/dev/usb/ubt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubt.c,v 1.54 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ubt.c,v 1.55 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.54 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.55 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -285,12 +285,13 @@ static const struct hci_if ubt_hci = { * */ -int ubt_match(device_t, cfdata_t, void *); -void ubt_attach(device_t, device_t, void *); -int ubt_detach(device_t, int); -int ubt_activate(device_t, enum devact); +int ubt_match(device_t, cfdata_t, void *); +void ubt_attach(device_t, device_t, void *); +int ubt_detach(device_t, int); +int ubt_activate(device_t, enum devact); extern struct cfdriver ubt_cd; -CFATTACH_DECL_NEW(ubt, sizeof(struct ubt_softc), ubt_match, ubt_attach, ubt_detach, ubt_activate); +CFATTACH_DECL_NEW(ubt, sizeof(struct ubt_softc), ubt_match, ubt_attach, + ubt_detach, ubt_activate); static int ubt_set_isoc_config(struct ubt_softc *); static int ubt_sysctl_config(SYSCTLFN_PROTO); @@ -601,8 +602,7 @@ ubt_attach(device_t parent, device_t self, void *aux) /* Attach HCI */ sc->sc_unit = hci_attach_pcb(&ubt_hci, sc->sc_dev, 0); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); /* sysctl set-up for alternate configs */ sysctl_createv(&sc->sc_log, 0, NULL, &node, @@ -700,8 +700,7 @@ ubt_detach(device_t self, int flags) splx(s); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); DPRINTFN(1, "driver detached\n"); diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c index 618937d52da..c746232fb5d 100644 --- a/sys/dev/usb/uchcom.c +++ b/sys/dev/usb/uchcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: uchcom.c,v 1.14 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uchcom.c,v 1.15 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.14 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.15 2016/07/07 06:55:42 msaitoh Exp $"); /* * driver for WinChipHead CH341/340, the worst USB-serial chip in the world. @@ -295,8 +295,7 @@ uchcom_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_arg = sc; ucaa.ucaa_info = NULL; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); @@ -332,8 +331,7 @@ uchcom_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c index 02a84782267..6b75bf45279 100644 --- a/sys/dev/usb/ucycom.c +++ b/sys/dev/usb/ucycom.c @@ -1,4 +1,4 @@ -/* $NetBSD: ucycom.c,v 1.43 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ucycom.c,v 1.44 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.43 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.44 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -186,20 +186,21 @@ Static const struct usb_devno ucycom_devs[] = { }; #define ucycom_lookup(v, p) usb_lookup(ucycom_devs, v, p) -int ucycom_match(device_t, cfdata_t, void *); -void ucycom_attach(device_t, device_t, void *); -int ucycom_detach(device_t, int); -int ucycom_activate(device_t, enum devact); +int ucycom_match(device_t, cfdata_t, void *); +void ucycom_attach(device_t, device_t, void *); +int ucycom_detach(device_t, int); +int ucycom_activate(device_t, enum devact); extern struct cfdriver ucycom_cd; -CFATTACH_DECL_NEW(ucycom, sizeof(struct ucycom_softc), ucycom_match, ucycom_attach, ucycom_detach, ucycom_activate); +CFATTACH_DECL_NEW(ucycom, sizeof(struct ucycom_softc), ucycom_match, + ucycom_attach, ucycom_detach, ucycom_activate); int ucycom_match(device_t parent, cfdata_t match, void *aux) { struct uhidev_attach_arg *uha = aux; - return ucycom_lookup(uha->uiaa->uiaa_vendor, uha->uiaa->uiaa_product) != NULL ? - UMATCH_VENDOR_PRODUCT : UMATCH_NONE; + return ucycom_lookup(uha->uiaa->uiaa_vendor, uha->uiaa->uiaa_product) + != NULL ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE; } void @@ -514,8 +515,8 @@ ucycomstart(struct tty *tp) memcpy(sc->sc_obuf + 1, data, len); sc->sc_obuf[0] = len | sc->sc_mcr; - DPRINTF(("ucycomstart(8): sc->sc_obuf[0] = %d | %d = %d\n", len, - sc->sc_mcr, sc->sc_obuf[0])); + DPRINTF(("ucycomstart(8): sc->sc_obuf[0] = %d | %d = %d\n", + len, sc->sc_mcr, sc->sc_obuf[0])); #ifdef UCYCOM_DEBUG if (ucycomdebug > 10) { uint32_t i; diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c index 99b497a04e3..09290c10835 100644 --- a/sys/dev/usb/udsbr.c +++ b/sys/dev/usb/udsbr.c @@ -1,4 +1,4 @@ -/* $NetBSD: udsbr.c,v 1.23 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: udsbr.c,v 1.24 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.23 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.24 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -150,8 +150,7 @@ udsbr_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("udsbr_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_child = radio_attach_mi(&udsbr_hw_if, sc, sc->sc_dev); @@ -172,8 +171,7 @@ udsbr_detach(device_t self, int flags) if (sc->sc_child != NULL) rv = config_detach(sc->sc_child, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/udsir.c b/sys/dev/usb/udsir.c index 6bf6c13f6bd..dff0910b601 100644 --- a/sys/dev/usb/udsir.c +++ b/sys/dev/usb/udsir.c @@ -1,4 +1,4 @@ -/* $NetBSD: udsir.c,v 1.2 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: udsir.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.2 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -224,8 +224,7 @@ udsir_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("udsir_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ia.ia_type = IR_TYPE_IRFRAME; ia.ia_methods = &udsir_methods; diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index eeeebf3d08b..f061eb76637 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -1,4 +1,4 @@ -/* $NetBSD: uftdi.c,v 1.61 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uftdi.c,v 1.62 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.61 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.62 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -335,8 +335,7 @@ uftdi_attach(device_t parent, device_t self, void *aux) &ucaa, ucomprint, ucomsubmatch); } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; @@ -387,8 +386,7 @@ uftdi_detach(device_t self, int flags) config_detach(sc->sc_subdev[i], flags); } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 6659191856c..7ae800aa404 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.133 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ugen.c,v 1.134 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.133 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.134 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -181,12 +181,13 @@ Static void ugen_clear_endpoints(struct ugen_softc *); #define UGENENDPOINT(n) (minor(n) & 0xf) #define UGENDEV(u, e) (makedev(0, ((u) << 4) | (e))) -int ugen_match(device_t, cfdata_t, void *); -void ugen_attach(device_t, device_t, void *); -int ugen_detach(device_t, int); -int ugen_activate(device_t, enum devact); +int ugen_match(device_t, cfdata_t, void *); +void ugen_attach(device_t, device_t, void *); +int ugen_detach(device_t, int); +int ugen_activate(device_t, enum devact); extern struct cfdriver ugen_cd; -CFATTACH_DECL_NEW(ugen, sizeof(struct ugen_softc), ugen_match, ugen_attach, ugen_detach, ugen_activate); +CFATTACH_DECL_NEW(ugen, sizeof(struct ugen_softc), ugen_match, ugen_attach, + ugen_detach, ugen_activate); /* toggle to control attach priority. -1 means "let autoconf decide" */ int ugen_override = -1; @@ -262,8 +263,7 @@ ugen_attach(device_t parent, device_t self, void *aux) return; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -1064,8 +1064,7 @@ ugen_detach(device_t self, int flags) mn = device_unit(self) * USB_MAX_ENDPOINTS; vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); for (i = 0; i < USB_MAX_ENDPOINTS; i++) { for (dir = OUT; dir <= IN; dir++) { diff --git a/sys/dev/usb/ugensa.c b/sys/dev/usb/ugensa.c index 46b3780b1e5..df207a8eec4 100644 --- a/sys/dev/usb/ugensa.c +++ b/sys/dev/usb/ugensa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ugensa.c,v 1.32 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ugensa.c,v 1.33 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.32 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.33 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -195,8 +195,7 @@ ugensa_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_methods = &ugensa_methods; ucaa.ucaa_arg = sc; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1; for (i = 0; i < id->bNumEndpoints; i++) { @@ -290,8 +289,7 @@ ugensa_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 8377c2d07a0..1000e3a8b47 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhid.c,v 1.97 2016/05/09 04:55:34 mlelstv Exp $ */ +/* $NetBSD: uhid.c,v 1.98 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.97 2016/05/09 04:55:34 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.98 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -138,12 +138,13 @@ Static int uhid_do_read(struct uhid_softc *, struct uio *, int); Static int uhid_do_write(struct uhid_softc *, struct uio *, int); Static int uhid_do_ioctl(struct uhid_softc*, u_long, void *, int, struct lwp *); -int uhid_match(device_t, cfdata_t, void *); -void uhid_attach(device_t, device_t, void *); -int uhid_detach(device_t, int); -int uhid_activate(device_t, enum devact); +int uhid_match(device_t, cfdata_t, void *); +void uhid_attach(device_t, device_t, void *); +int uhid_detach(device_t, int); +int uhid_activate(device_t, enum devact); extern struct cfdriver uhid_cd; -CFATTACH_DECL_NEW(uhid, sizeof(struct uhid_softc), uhid_match, uhid_attach, uhid_detach, uhid_activate); +CFATTACH_DECL_NEW(uhid, sizeof(struct uhid_softc), uhid_match, uhid_attach, + uhid_detach, uhid_activate); int uhid_match(device_t parent, cfdata_t match, void *aux) @@ -173,8 +174,7 @@ uhid_attach(device_t parent, device_t self, void *aux) sc->sc_hdev.sc_intr = uhid_intr; sc->sc_hdev.sc_parent = uha->parent; sc->sc_hdev.sc_report_id = uha->reportid; - sc->sc_sih = softint_establish(SOFTINT_CLOCK, - uhid_softintr, sc); + sc->sc_sih = softint_establish(SOFTINT_CLOCK, uhid_softintr, sc); uhidev_get_report_desc(uha->parent, &desc, &size); repid = uha->reportid; @@ -244,8 +244,7 @@ uhid_detach(device_t self, int flags) #if 0 usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, - sc->sc_hdev.sc_parent->sc_udev, - sc->sc_hdev.sc_dev); + sc->sc_hdev.sc_parent->sc_udev, sc->sc_hdev.sc_dev); #endif cv_destroy(&sc->sc_cv); cv_destroy(&sc->sc_detach_cv); diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index 4a11a1df00d..8f8ae1f72bb 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhidev.c,v 1.67 2016/04/30 18:40:26 jakllsch Exp $ */ +/* $NetBSD: uhidev.c,v 1.68 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.67 2016/04/30 18:40:26 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.68 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -331,8 +331,7 @@ nomem: sc->sc_isize = maxinpktsize; sc->sc_nrepid = nrepid; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); for (repid = 0; repid < nrepid; repid++) { repsz = hid_report_size(desc, size, hid_input, repid); @@ -464,8 +463,7 @@ uhidev_detach(device_t self, int flags) } } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); pmf_device_deregister(self); mutex_destroy(&sc->sc_lock); diff --git a/sys/dev/usb/uhso.c b/sys/dev/usb/uhso.c index cf153f0f23c..bbb5731838c 100644 --- a/sys/dev/usb/uhso.c +++ b/sys/dev/usb/uhso.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhso.c,v 1.21 2016/06/10 13:27:15 ozaki-r Exp $ */ +/* $NetBSD: uhso.c,v 1.22 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2009 Iain Hibbert @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.21 2016/06/10 13:27:15 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.22 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -342,7 +342,8 @@ CFATTACH_DECL_NEW(uhso, sizeof(struct uhso_softc), uhso_match, uhso_attach, Static int uhso_switch_mode(struct usbd_device *); Static int uhso_get_iface_spec(struct usb_attach_arg *, uint8_t, uint8_t *); -Static usb_endpoint_descriptor_t *uhso_get_endpoint(struct usbd_interface *, int, int); +Static usb_endpoint_descriptor_t *uhso_get_endpoint(struct usbd_interface *, + int, int); Static void uhso_mux_attach(struct uhso_softc *, struct usbd_interface *, int); Static int uhso_mux_abort(struct uhso_port *); @@ -410,7 +411,8 @@ Static int uhso_tty_control(struct uhso_port *, u_long, int); #define UHSODIALOUT(x) TTDIALOUT(x) #define UHSOMINOR(u, p) ((((u) << 4) & UHSO_UNIT_MASK) | ((p) & UHSO_UNIT_MASK)) -Static void uhso_ifnet_attach(struct uhso_softc *, struct usbd_interface *, int); +Static void uhso_ifnet_attach(struct uhso_softc *, struct usbd_interface *, + int); Static int uhso_ifnet_abort(struct uhso_port *); Static int uhso_ifnet_detach(struct uhso_port *); Static void uhso_ifnet_read_cb(struct usbd_xfer *, void *, usbd_status); @@ -481,7 +483,8 @@ uhso_attach(device_t parent, device_t self, void *aux) } if (uaa->uaa_class != UDCLASS_VENDOR) { - aprint_verbose_dev(self, "Switching device into modem mode..\n"); + aprint_verbose_dev(self, + "Switching device into modem mode..\n"); if (uhso_switch_mode(uaa->uaa_device) != 0) aprint_error_dev(self, "modem switch failed\n"); @@ -776,8 +779,8 @@ uhso_mux_attach(struct uhso_softc *sc, struct usbd_interface *ifh, int index) sc, buf, size, uhso_mux_intr, USBD_DEFAULT_INTERVAL); if (status != USBD_NORMAL_COMPLETION) { - aprint_error_dev(sc->sc_dev, "failed to open interrupt pipe: %s", - usbd_errstr(status)); + aprint_error_dev(sc->sc_dev, + "failed to open interrupt pipe: %s", usbd_errstr(status)); kmem_free(buf, size); return; @@ -915,7 +918,8 @@ uhso_mux_write(struct uhso_port *hp) usb_device_request_t req; usbd_status status; - DPRINTF(5, "hp=%p, index=%d, wlen=%zd\n", hp, hp->hp_index, hp->hp_wlen); + DPRINTF(5, "hp=%p, index=%d, wlen=%zd\n", hp, hp->hp_index, + hp->hp_wlen); req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SEND_ENCAPSULATED_COMMAND; @@ -1054,7 +1058,8 @@ uhso_bulk_attach(struct uhso_softc *sc, struct usbd_interface *ifh, int index) id = usbd_get_interface_descriptor(ifh); if (id == NULL) { - aprint_error_dev(sc->sc_dev, "interface descriptor not found\n"); + aprint_error_dev(sc->sc_dev, + "interface descriptor not found\n"); return; } @@ -1758,7 +1763,8 @@ void uhso_tty_stop(struct tty *tp, int flag) { #if 0 - struct uhso_softc *sc = device_lookup_private(&uhso_cd, UHSOUNIT(tp->t_dev)); + struct uhso_softc *sc = device_lookup_private(&uhso_cd, + UHSOUNIT(tp->t_dev)); struct uhso_port *hp = sc->sc_port[UHSOPORT(tp->t_dev)]; #endif } @@ -1796,7 +1802,8 @@ uhso_tty_poll(dev_t dev, int events, struct lwp *l) Static int uhso_tty_param(struct tty *tp, struct termios *t) { - struct uhso_softc *sc = device_lookup_private(&uhso_cd, UHSOUNIT(tp->t_dev)); + struct uhso_softc *sc = device_lookup_private(&uhso_cd, + UHSOUNIT(tp->t_dev)); struct uhso_port *hp = sc->sc_port[UHSOPORT(tp->t_dev)]; if (!device_is_active(sc->sc_dev)) @@ -1834,7 +1841,8 @@ uhso_tty_param(struct tty *tp, struct termios *t) Static void uhso_tty_start(struct tty *tp) { - struct uhso_softc *sc = device_lookup_private(&uhso_cd, UHSOUNIT(tp->t_dev)); + struct uhso_softc *sc = device_lookup_private(&uhso_cd, + UHSOUNIT(tp->t_dev)); struct uhso_port *hp = sc->sc_port[UHSOPORT(tp->t_dev)]; int s; @@ -2112,7 +2120,8 @@ uhso_ifnet_input(struct ifnet *ifp, struct mbuf **mb, uint8_t *cp, size_t cc) want = mtod(m, struct ip *)->ip_hl << 2; if (mtod(m, struct ip *)->ip_v != 4 || want != sizeof(struct ip)) { - aprint_error_ifnet(ifp, "bad IP header (v=%d, hl=%zd)\n", + aprint_error_ifnet(ifp, + "bad IP header (v=%d, hl=%zd)\n", mtod(m, struct ip *)->ip_v, want); ifp->if_ierrors++; @@ -2203,7 +2212,8 @@ uhso_ifnet_ioctl(struct ifnet *ifp, u_long cmd, void *data) } SET(ifp->if_flags, IFF_RUNNING); - DPRINTF(1, "hp=%p, ifp=%p INITIFADDR\n", hp, ifp); + DPRINTF(1, "hp=%p, ifp=%p INITIFADDR\n", hp, + ifp); break; } @@ -2339,8 +2349,8 @@ uhso_ifnet_start(struct ifnet *ifp) } Static int -uhso_ifnet_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, - const struct rtentry *rt0) +uhso_ifnet_output(struct ifnet *ifp, struct mbuf *m, + const struct sockaddr *dst, const struct rtentry *rt0) { int error; diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c index 2046b93d104..484768106a0 100644 --- a/sys/dev/usb/uipaq.c +++ b/sys/dev/usb/uipaq.c @@ -1,4 +1,4 @@ -/* $NetBSD: uipaq.c,v 1.20 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uipaq.c,v 1.21 2016/07/07 06:55:42 msaitoh Exp $ */ /* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */ /* @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.20 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.21 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -177,8 +177,8 @@ uipaq_attach(device_t parent, device_t self, void *aux) /* Move the device into the configured state. */ err = usbd_set_config_no(dev, UIPAQ_CONFIG_NO, 1); if (err) { - aprint_error_dev(self, "failed to set configuration" - ", err=%s\n", usbd_errstr(err)); + aprint_error_dev(self, "failed to set configuration, err=%s\n", + usbd_errstr(err)); goto bad; } @@ -214,8 +214,7 @@ uipaq_attach(device_t parent, device_t self, void *aux) goto bad; }*/ - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1; for (i=0; i<id->bNumEndpoints; i++) { @@ -269,7 +268,8 @@ uipaq_dtr(struct uipaq_softc* sc, int onoff) /* Other parameters depend on reg */ req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SET_CONTROL_LINE_STATE; - sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_DTR : sc->sc_lcr & ~UCDC_LINE_DTR; + sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_DTR + : sc->sc_lcr & ~UCDC_LINE_DTR; USETW(req.wValue, sc->sc_lcr); USETW(req.wIndex, 0x0); USETW(req.wLength, 0); @@ -299,7 +299,8 @@ uipaq_rts(struct uipaq_softc* sc, int onoff) req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SET_CONTROL_LINE_STATE; - sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_RTS : sc->sc_lcr & ~UCDC_LINE_RTS; + sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_RTS + : sc->sc_lcr & ~UCDC_LINE_RTS; USETW(req.wValue, sc->sc_lcr); USETW(req.wIndex, 0x0); USETW(req.wLength, 0); @@ -320,7 +321,8 @@ uipaq_break(struct uipaq_softc* sc, int onoff) usbd_status err; int retries = 3; - DPRINTF(("%s: uipaq_break: onoff=%x\n", device_xname(sc->sc_dev), onoff)); + DPRINTF(("%s: uipaq_break: onoff=%x\n", device_xname(sc->sc_dev), + onoff)); req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SEND_BREAK; @@ -395,8 +397,7 @@ uipaq_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv |= config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/uirda.c b/sys/dev/usb/uirda.c index 4542548489e..edd844ae1fa 100644 --- a/sys/dev/usb/uirda.c +++ b/sys/dev/usb/uirda.c @@ -1,4 +1,4 @@ -/* $NetBSD: uirda.c,v 1.39 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uirda.c,v 1.40 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.39 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.40 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -274,8 +274,7 @@ uirda_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("uirda_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); mutex_init(&sc->sc_wr_buf_lk, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_rd_buf_lk, MUTEX_DEFAULT, IPL_NONE); @@ -338,8 +337,7 @@ uirda_detach(device_t self, int flags) if (sc->sc_child != NULL) rv = config_detach(sc->sc_child, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); mutex_destroy(&sc->sc_wr_buf_lk); mutex_destroy(&sc->sc_rd_buf_lk); diff --git a/sys/dev/usb/ukyopon.c b/sys/dev/usb/ukyopon.c index f0bdee09509..70bb578d1d4 100644 --- a/sys/dev/usb/ukyopon.c +++ b/sys/dev/usb/ukyopon.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukyopon.c,v 1.17 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ukyopon.c,v 1.18 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.17 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.18 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,12 +96,13 @@ Static struct ucom_methods ukyopon_methods = { .ucom_write = NULL, }; -int ukyopon_match(device_t, cfdata_t, void *); -void ukyopon_attach(device_t, device_t, void *); -int ukyopon_detach(device_t, int); -int ukyopon_activate(device_t, enum devact); +int ukyopon_match(device_t, cfdata_t, void *); +void ukyopon_attach(device_t, device_t, void *); +int ukyopon_detach(device_t, int); +int ukyopon_activate(device_t, enum devact); extern struct cfdriver ukyopon_cd; -CFATTACH_DECL_NEW(ukyopon, sizeof(struct ukyopon_softc), ukyopon_match, ukyopon_attach, ukyopon_detach, ukyopon_activate); +CFATTACH_DECL_NEW(ukyopon, sizeof(struct ukyopon_softc), ukyopon_match, + ukyopon_attach, ukyopon_detach, ukyopon_activate); int ukyopon_match(device_t parent, cfdata_t match, void *aux) diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 06d59dd7975..1f4f5e13f38 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ulpt.c,v 1.96 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ulpt.c,v 1.97 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.96 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.97 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -151,8 +151,7 @@ int ulpt_do_read(struct ulpt_softc *, struct uio *, int); int ulpt_status(struct ulpt_softc *); void ulpt_reset(struct ulpt_softc *); int ulpt_statusmsg(u_char, struct ulpt_softc *); -void ulpt_read_cb(struct usbd_xfer *, void *, - usbd_status); +void ulpt_read_cb(struct usbd_xfer *, void *, usbd_status); void ulpt_tick(void *xsc); #if 0 @@ -163,10 +162,10 @@ void ieee1284_print_id(char *); #define ULPTFLAGS(s) (minor(s) & 0xe0) -int ulpt_match(device_t, cfdata_t, void *); -void ulpt_attach(device_t, device_t, void *); -int ulpt_detach(device_t, int); -int ulpt_activate(device_t, enum devact); +int ulpt_match(device_t, cfdata_t, void *); +void ulpt_attach(device_t, device_t, void *); +int ulpt_detach(device_t, int); +int ulpt_activate(device_t, enum devact); extern struct cfdriver ulpt_cd; @@ -318,8 +317,7 @@ ulpt_attach(device_t parent, device_t self, void *aux) } #endif - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTFN(1, ("ulpt_attach: sc=%p in=%d out=%d\n", sc, sc->sc_out, sc->sc_in)); @@ -372,8 +370,7 @@ ulpt_detach(device_t self, int flags) vdevgone(maj, mn, mn, VCHR); vdevgone(maj, mn | ULPT_NOPRIME , mn | ULPT_NOPRIME, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 8390098e183..216d70dbdcf 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $NetBSD: umass.c,v 1.155 2016/07/03 07:27:37 skrll Exp $ */ +/* $NetBSD: umass.c,v 1.156 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -124,7 +124,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.155 2016/07/03 07:27:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.156 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -220,8 +220,8 @@ int umass_detach(device_t, int); static void umass_childdet(device_t, device_t); int umass_activate(device_t, enum devact); extern struct cfdriver umass_cd; -CFATTACH_DECL2_NEW(umass, sizeof(struct umass_softc), umass_match, umass_attach, - umass_detach, umass_activate, NULL, umass_childdet); +CFATTACH_DECL2_NEW(umass, sizeof(struct umass_softc), umass_match, + umass_attach, umass_detach, umass_activate, NULL, umass_childdet); Static void umass_disco(struct umass_softc *sc); @@ -254,7 +254,8 @@ Static void umass_cbi_transfer(struct umass_softc *, int, void *, int, void *, Static void umass_cbi_reset(struct umass_softc *, int); Static void umass_cbi_state(struct usbd_xfer *, void *, usbd_status); -Static int umass_cbi_adsc(struct umass_softc *, char *, int, int, struct usbd_xfer *); +Static int umass_cbi_adsc(struct umass_softc *, char *, int, int, + struct usbd_xfer *); const struct umass_wire_methods umass_bbb_methods = { .wire_xfer = umass_bbb_transfer, @@ -537,7 +538,7 @@ umass_attach(device_t parent, device_t self, void *aux) DPRINTFM(UDMASS_USB, "sc %p: opening iface %p epaddr %d for BULKIN", sc, sc->sc_iface, sc->sc_epaddr[UMASS_BULKIN], 0); err = usbd_open_pipe(sc->sc_iface, sc->sc_epaddr[UMASS_BULKIN], - USBD_EXCLUSIVE_USE, &sc->sc_pipe[UMASS_BULKIN]); + USBD_EXCLUSIVE_USE, &sc->sc_pipe[UMASS_BULKIN]); if (err) { aprint_error_dev(self, "could not open %u-in pipe (bulk)\n", sc->sc_epaddr[UMASS_BULKIN]); @@ -557,7 +558,8 @@ umass_attach(device_t parent, device_t self, void *aux) * arriving concurrently. */ if (sc->sc_wire == UMASS_WPROTO_CBI_I) { - DPRINTFM(UDMASS_USB, "sc %p: opening iface %p epaddr %d for INTRIN", + DPRINTFM(UDMASS_USB, + "sc %p: opening iface %p epaddr %d for INTRIN", sc, sc->sc_iface, sc->sc_epaddr[UMASS_INTRIN], 0); err = usbd_open_pipe(sc->sc_iface, sc->sc_epaddr[UMASS_INTRIN], USBD_EXCLUSIVE_USE, &sc->sc_pipe[UMASS_INTRIN]); @@ -765,8 +767,7 @@ umass_attach(device_t parent, device_t self, void *aux) return; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -828,8 +829,7 @@ umass_detach(device_t self, int flags) umass_disco(sc); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); mutex_destroy(&sc->sc_lock); cv_destroy(&sc->sc_detach_cv); @@ -1203,10 +1203,10 @@ umass_bbb_state(struct usbd_xfer *xfer, void *priv, } else if (sc->transfer_dir == DIR_OUT) { memcpy(sc->dataout_buffer, sc->transfer_data, sc->transfer_datalen); - if (umass_setup_transfer(sc, sc->sc_pipe[UMASS_BULKOUT], - sc->dataout_buffer, sc->transfer_datalen, - 0,/* fixed length transfer */ - sc->transfer_xfer[XFER_BBB_DATAOUT])) + if (umass_setup_transfer(sc, + sc->sc_pipe[UMASS_BULKOUT], sc->dataout_buffer, + sc->transfer_datalen, 0,/* fixed length transfer */ + sc->transfer_xfer[XFER_BBB_DATAOUT])) umass_bbb_reset(sc, STATUS_WIRE_FAILED); return; @@ -1301,8 +1301,8 @@ umass_bbb_state(struct usbd_xfer *xfer, void *priv, case TSTATE_BBB_STATUS2: /* second attempt */ /* Status transfer, error handling */ if (err) { - DPRINTFM(UDMASS_BBB, "sc %p Failed to read CSW " - "err %d (state %d)", sc, err, sc->transfer_state, 0); + DPRINTFM(UDMASS_BBB, "sc %p Failed to read CSW err %d " + "(state %d)", sc, err, sc->transfer_state, 0); /* If this was the first attempt at fetching the CSW * retry it, otherwise fail. @@ -1594,7 +1594,8 @@ umass_cbi_transfer(struct umass_softc *sc, int lun, sc->transfer_state = TSTATE_CBI_COMMAND; /* Send the Command Block from host to device via control endpoint. */ - if (umass_cbi_adsc(sc, cmd, cmdlen, flags, sc->transfer_xfer[XFER_CBI_CB])) + if (umass_cbi_adsc(sc, cmd, cmdlen, flags, + sc->transfer_xfer[XFER_CBI_CB])) umass_cbi_reset(sc, STATUS_WIRE_FAILED); } @@ -1809,7 +1810,8 @@ umass_cbi_state(struct usbd_xfer *xfer, void *priv, sc->transfer_state = TSTATE_IDLE; sc->transfer_cb(sc, sc->transfer_priv, - sc->transfer_datalen - sc->transfer_actlen, status); + sc->transfer_datalen - sc->transfer_actlen, + status); } } return; diff --git a/sys/dev/usb/umcs.c b/sys/dev/usb/umcs.c index 9792e25e60d..c4ad74c6e35 100644 --- a/sys/dev/usb/umcs.c +++ b/sys/dev/usb/umcs.c @@ -1,4 +1,4 @@ -/* $NetBSD: umcs.c,v 1.9 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: umcs.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $ */ /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */ /*- @@ -41,7 +41,7 @@ * */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.9 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.10 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -282,8 +282,7 @@ umcs7840_attach(device_t parent, device_t self, void *aux) usb_init_task(&sc->sc_change_task, umcs7840_change_task, sc, USB_TASKQ_MPSAFE); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); memset(&ucaa, 0, sizeof(ucaa)); ucaa.ucaa_ibufsize = 256; @@ -530,8 +529,7 @@ umcs7840_detach(device_t self, int flags) } } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c index 0c4443b1f91..85164616328 100644 --- a/sys/dev/usb/umct.c +++ b/sys/dev/usb/umct.c @@ -1,4 +1,4 @@ -/* $NetBSD: umct.c,v 1.34 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: umct.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.34 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -296,8 +296,7 @@ umct_attach(device_t parent, device_t self, void *aux) umct_init(sc); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF(("umct: in=0x%x out=0x%x intr=0x%x\n", ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number)); @@ -335,8 +334,7 @@ umct_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index f8762c2e496..f27a5ce6877 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $NetBSD: umidi.c,v 1.70 2016/05/07 08:09:43 mrg Exp $ */ +/* $NetBSD: umidi.c,v 1.71 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001, 2012, 2014 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.70 2016/05/07 08:09:43 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.71 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -397,8 +397,7 @@ umidi_attach(device_t parent, device_t self, void *aux) dump_sc(sc); #endif - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, - sc->sc_udev, sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; @@ -467,8 +466,7 @@ umidi_detach(device_t self, int flags) free_all_jacks(sc); free_all_endpoints(sc); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); mutex_destroy(&sc->sc_lock); cv_destroy(&sc->sc_detach_cv); @@ -696,7 +694,8 @@ alloc_pipe(struct umidi_endpoint *ep) } ep->buffer = usbd_get_buffer(ep->xfer); ep->next_slot = ep->buffer; - ep->solicit_cookie = softint_establish(SOFTINT_CLOCK | SOFTINT_MPSAFE, out_solicit, ep); + ep->solicit_cookie = softint_establish(SOFTINT_CLOCK | SOFTINT_MPSAFE, + out_solicit, ep); quit: return err; } @@ -800,8 +799,8 @@ alloc_all_endpoints_fixed_ep(struct umidi_softc *sc) } if (UE_GET_XFERTYPE(epd->bmAttributes)!=UE_BULK || UE_GET_DIR(epd->bEndpointAddress)!=UE_DIR_OUT) { - aprint_error_dev(sc->sc_dev, "illegal endpoint(out:%d)\n", - fp->out_ep[i].ep); + aprint_error_dev(sc->sc_dev, + "illegal endpoint(out:%d)\n", fp->out_ep[i].ep); err = USBD_INVAL; goto error; } @@ -1084,8 +1083,9 @@ alloc_all_jacks(struct umidi_softc *sc) cn_spec = NULL; /* allocate/initialize structures */ - sc->sc_jacks = kmem_zalloc(sizeof(*sc->sc_out_jacks)*(sc->sc_in_num_jacks+ - sc->sc_out_num_jacks), KM_SLEEP); + sc->sc_jacks = + kmem_zalloc(sizeof(*sc->sc_out_jacks)*(sc->sc_in_num_jacks + + sc->sc_out_num_jacks), KM_SLEEP); if (!sc->sc_jacks) return USBD_NOMEM; sc->sc_out_jacks = @@ -1156,7 +1156,8 @@ free_all_jacks(struct umidi_softc *sc) mutex_enter(&sc->sc_lock); jacks = sc->sc_jacks; - len = sizeof(*sc->sc_out_jacks)*(sc->sc_in_num_jacks+sc->sc_out_num_jacks); + len = sizeof(*sc->sc_out_jacks) + * (sc->sc_in_num_jacks + sc->sc_out_num_jacks); sc->sc_jacks = sc->sc_in_jacks = sc->sc_out_jacks = NULL; mutex_exit(&sc->sc_lock); @@ -1737,9 +1738,9 @@ out_jack_output(struct umidi_jack *out_jack, u_char *src, int len, int cin) if (umididebug >= 100) microtime(&umidi_tv); #endif - DPRINTFN(100, ("umidi out: %"PRIu64".%06"PRIu64"s ep=%p cn=%d len=%d cin=%#x\n", - umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec, - ep, out_jack->cable_number, len, cin)); + DPRINTFN(100, ("umidi out: %"PRIu64".%06"PRIu64 + "s ep=%p cn=%d len=%d cin=%#x\n", umidi_tv.tv_sec%100, + (uint64_t)umidi_tv.tv_usec, ep, out_jack->cable_number, len, cin)); packet = *ep->next_slot++; KASSERT(ep->buffer_size >= @@ -1890,9 +1891,10 @@ out_intr(struct usbd_xfer *xfer, void *priv, #endif usbd_get_xfer_status(xfer, NULL, NULL, &count, NULL); if (0 == count % UMIDI_PACKET_SIZE) { - DPRINTFN(200,("%s: %"PRIu64".%06"PRIu64"s out ep %p xfer length %u\n", - device_xname(ep->sc->sc_dev), - umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec, ep, count)); + DPRINTFN(200, ("%s: %"PRIu64".%06"PRIu64"s out ep %p xfer " + "length %u\n", device_xname(ep->sc->sc_dev), + umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec, ep, + count)); } else { DPRINTF(("%s: output endpoint %p odd transfer length %u\n", device_xname(ep->sc->sc_dev), ep, count)); diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index 496806e95be..f6b185cab4a 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -1,4 +1,4 @@ -/* $NetBSD: umodem.c,v 1.68 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: umodem.c,v 1.69 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.68 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.69 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,10 +81,10 @@ Static struct ucom_methods umodem_methods = { .ucom_write = NULL, }; -int umodem_match(device_t, cfdata_t, void *); -void umodem_attach(device_t, device_t, void *); -int umodem_detach(device_t, int); -int umodem_activate(device_t, enum devact); +int umodem_match(device_t, cfdata_t, void *); +void umodem_attach(device_t, device_t, void *); +int umodem_detach(device_t, int); +int umodem_activate(device_t, enum devact); extern struct cfdriver umodem_cd; diff --git a/sys/dev/usb/umodem_common.c b/sys/dev/usb/umodem_common.c index b39baf5af13..3b270610201 100644 --- a/sys/dev/usb/umodem_common.c +++ b/sys/dev/usb/umodem_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: umodem_common.c,v 1.23 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: umodem_common.c,v 1.24 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.23 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.24 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -243,8 +243,7 @@ umodem_common_attach(device_t self, struct umodem_softc *sc, ucaa->ucaa_iface = sc->sc_data_iface; ucaa->ucaa_arg = sc; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF(("umodem_common_attach: sc=%p\n", sc)); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, ucaa, @@ -676,8 +675,7 @@ umodem_common_detach(struct umodem_softc *sc, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 4ac0314d7e1..4d977961600 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: uplcom.c,v 1.78 2016/05/11 06:38:04 skrll Exp $ */ +/* $NetBSD: uplcom.c,v 1.79 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.78 2016/05/11 06:38:04 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.79 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -351,8 +351,8 @@ uplcom_attach(device_t parent, device_t self, void *aux) err = usbd_device2interface_handle(dev, UPLCOM_SECOND_IFACE_INDEX, &sc->sc_iface); if (err) { - aprint_error("\n%s: failed to get second interface, err=%s\n", - devname, usbd_errstr(err)); + aprint_error("\n%s: failed to get second interface, " + "err=%s\n", devname, usbd_errstr(err)); sc->sc_dying = 1; return; } @@ -414,8 +414,7 @@ uplcom_attach(device_t parent, device_t self, void *aux) return; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF(("uplcom: in=0x%x out=0x%x intr=0x%x\n", ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number )); @@ -456,8 +455,7 @@ uplcom_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); if (rv == 0) pmf_device_deregister(self); @@ -759,7 +757,8 @@ uplcom_param(void *addr, int portno, struct termios *t) } Static usbd_status -uplcom_vendor_control_write(struct usbd_device *dev, uint16_t value, uint16_t index) +uplcom_vendor_control_write(struct usbd_device *dev, uint16_t value, + uint16_t index) { usb_device_request_t req; usbd_status err; @@ -842,8 +841,7 @@ uplcom_close(void *addr, int portno) } void -uplcom_intr(struct usbd_xfer *xfer, void *priv, - usbd_status status) +uplcom_intr(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct uplcom_softc *sc = priv; u_char *buf = sc->sc_intr_buf; @@ -862,7 +860,8 @@ uplcom_intr(struct usbd_xfer *xfer, void *priv, return; } - DPRINTF(("%s: uplcom status = %02x\n", device_xname(sc->sc_dev), buf[8])); + DPRINTF(("%s: uplcom status = %02x\n", device_xname(sc->sc_dev), + buf[8])); sc->sc_lsr = sc->sc_msr = 0; pstatus = buf[8]; diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index 5d25a983374..116dbb18b20 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -1,4 +1,4 @@ -/* $NetBSD: urio.c,v 1.43 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: urio.c,v 1.44 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.43 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.44 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -122,12 +122,13 @@ static const struct usb_devno urio_devs[] = { }; #define urio_lookup(v, p) usb_lookup(urio_devs, v, p) -int urio_match(device_t, cfdata_t, void *); -void urio_attach(device_t, device_t, void *); -int urio_detach(device_t, int); -int urio_activate(device_t, enum devact); +int urio_match(device_t, cfdata_t, void *); +void urio_attach(device_t, device_t, void *); +int urio_detach(device_t, int); +int urio_activate(device_t, enum devact); extern struct cfdriver urio_cd; -CFATTACH_DECL_NEW(urio, sizeof(struct urio_softc), urio_match, urio_attach, urio_detach, urio_activate); +CFATTACH_DECL_NEW(urio, sizeof(struct urio_softc), urio_match, urio_attach, + urio_detach, urio_activate); int urio_match(device_t parent, cfdata_t match, void *aux) @@ -206,8 +207,7 @@ urio_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("urio_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; } @@ -248,8 +248,7 @@ urio_detach(device_t self, int flags) mn = device_unit(self); vdevgone(maj, mn, mn, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 1e8e9bd3f4d..ee9eba31646 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $NetBSD: uscanner.c,v 1.76 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uscanner.c,v 1.77 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.76 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.77 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -355,8 +355,7 @@ uscanner_attach(device_t parent, device_t self, void *aux) sc->sc_bulkout = ed_bulkout->bEndpointAddress; selinit(&sc->sc_selq); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; } @@ -636,8 +635,7 @@ uscanner_detach(device_t self, int flags) mn = device_unit(self) * USB_MAX_ENDPOINTS; vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); seldestroy(&sc->sc_selq); return 0; diff --git a/sys/dev/usb/uslsa.c b/sys/dev/usb/uslsa.c index 74f5885eb6e..f125c59e79a 100644 --- a/sys/dev/usb/uslsa.c +++ b/sys/dev/usb/uslsa.c @@ -1,4 +1,4 @@ -/* $NetBSD: uslsa.c,v 1.20 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uslsa.c,v 1.21 2016/07/07 06:55:42 msaitoh Exp $ */ /* from ugensa.c */ @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.20 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.21 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -156,11 +156,11 @@ uslsa_match(device_t parent, cfdata_t match, void *aux) { const struct usbif_attach_arg *uiaa = aux; - if (usb_lookup(uslsa_devs, uiaa->uiaa_vendor, uiaa->uiaa_product) != NULL) { + if (usb_lookup(uslsa_devs, uiaa->uiaa_vendor, uiaa->uiaa_product) + != NULL) return UMATCH_VENDOR_PRODUCT; - } else { + else return UMATCH_NONE; - } } static void @@ -202,8 +202,7 @@ uslsa_attach(device_t parent, device_t self, void *aux) ucaa.ucaa_methods = &uslsa_methods; ucaa.ucaa_arg = sc; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1; for (i = 0; i < id->bNumEndpoints; i++) { @@ -278,8 +277,7 @@ uslsa_detach(device_t self, int flags) rv = config_detach(sc->sc_subdev, flags); } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (rv); } @@ -348,7 +346,8 @@ uslsa_set(void *vsc, int portno, int reg, int onoff) sc = vsc; - DPRINTF((sc->sc_dev, "%s(%p, %d, %d, %d)\n", __func__, vsc, portno, reg, onoff)); + DPRINTF((sc->sc_dev, "%s(%p, %d, %d, %d)\n", __func__, vsc, portno, + reg, onoff)); if (sc->sc_dying) { return; @@ -415,7 +414,8 @@ uslsa_param(void *vsc, int portno, struct termios *t) __func__, baud, usbd_errstr(status)); value = SLSA_RV_BAUDDIV(t->c_ospeed); - if ((ret = uslsa_request_set(sc, SLSA_R_SET_BAUDDIV, value)) != 0) { + if ((ret = uslsa_request_set(sc, SLSA_R_SET_BAUDDIV, value)) + != 0) { device_printf(sc->sc_dev, "%s: SET_BAUDDIV failed\n", __func__); return ret; diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c index d82257aa6a1..2cd31e93498 100644 --- a/sys/dev/usb/usscanner.c +++ b/sys/dev/usb/usscanner.c @@ -1,4 +1,4 @@ -/* $NetBSD: usscanner.c,v 1.39 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: usscanner.c,v 1.40 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.39 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.40 2016/07/07 06:55:42 msaitoh Exp $"); #include "scsibus.h" #include <sys/param.h> @@ -198,8 +198,8 @@ usscanner_attach(device_t parent, device_t self, void *aux) err = usbd_set_config_no(dev, USSCANNER_CONFIG_NO, 1); if (err) { - aprint_error_dev(self, "failed to set configuration" - ", err=%s\n", usbd_errstr(err)); + aprint_error_dev(self, "failed to set configuration, err=%s\n", + usbd_errstr(err)); return; } @@ -326,8 +326,7 @@ usscanner_attach(device_t parent, device_t self, void *aux) sc->sc_channel.chan_nluns = 1; sc->sc_channel.chan_id = USSCANNER_SCSIID_HOST; - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); sc->sc_child = config_found(sc->sc_dev, &sc->sc_channel, scsiprint); @@ -385,8 +384,7 @@ usscanner_detach(device_t self, int flags) else rv = 0; - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } @@ -471,8 +469,7 @@ usscanner_sense(struct usscanner_softc *sc) } Static void -usscanner_intr_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_intr_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; int s; @@ -484,7 +481,8 @@ usscanner_intr_cb(struct usbd_xfer *xfer, void *priv, printf("%s: !UAS_STATUS\n", device_xname(sc->sc_dev)); } if (sc->sc_status != 0) { - printf("%s: status byte=0x%02x\n", device_xname(sc->sc_dev), sc->sc_status); + printf("%s: status byte=0x%02x\n", device_xname(sc->sc_dev), + sc->sc_status); } #endif /* XXX what should we do on non-0 status */ @@ -499,8 +497,7 @@ usscanner_intr_cb(struct usbd_xfer *xfer, void *priv, } Static void -usscanner_data_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_data_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; struct scsipi_xfer *xs = sc->sc_xs; @@ -539,8 +536,7 @@ usscanner_data_cb(struct usbd_xfer *xfer, void *priv, } Static void -usscanner_sensedata_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_sensedata_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; struct scsipi_xfer *xs = sc->sc_xs; @@ -593,8 +589,7 @@ usscanner_done(struct usscanner_softc *sc) } Static void -usscanner_sensecmd_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_sensecmd_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; struct scsipi_xfer *xs = sc->sc_xs; @@ -637,8 +632,7 @@ usscanner_sensecmd_cb(struct usbd_xfer *xfer, void *priv, } Static void -usscanner_cmd_cb(struct usbd_xfer *xfer, void *priv, - usbd_status status) +usscanner_cmd_cb(struct usbd_xfer *xfer, void *priv, usbd_status status) { struct usscanner_softc *sc = priv; struct scsipi_xfer *xs = sc->sc_xs; @@ -699,7 +693,8 @@ usscanner_cmd_cb(struct usbd_xfer *xfer, void *priv, } Static void -usscanner_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req, void *arg) +usscanner_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req, + void *arg) { struct scsipi_xfer *xs; struct usscanner_softc *sc = diff --git a/sys/dev/usb/ustir.c b/sys/dev/usb/ustir.c index 63c49a337e5..6d66d5b0fd3 100644 --- a/sys/dev/usb/ustir.c +++ b/sys/dev/usb/ustir.c @@ -1,4 +1,4 @@ -/* $NetBSD: ustir.c,v 1.34 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ustir.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.34 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,8 +289,7 @@ ustir_attach(device_t parent, device_t self, void *aux) DPRINTFN(10, ("ustir_attach: %p\n", sc->sc_udev)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); ia.ia_type = IR_TYPE_IRFRAME; ia.ia_methods = &ustir_methods; @@ -366,8 +365,7 @@ ustir_detach(device_t self, int flags) if (sc->sc_child != NULL) rv = config_detach(sc->sc_child, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); seldestroy(&sc->sc_rd_sel); seldestroy(&sc->sc_wr_sel); diff --git a/sys/dev/usb/utoppy.c b/sys/dev/usb/utoppy.c index 0cc5daf7f96..0763c601f09 100644 --- a/sys/dev/usb/utoppy.c +++ b/sys/dev/usb/utoppy.c @@ -1,4 +1,4 @@ -/* $NetBSD: utoppy.c,v 1.25 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: utoppy.c,v 1.26 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.25 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.26 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -194,12 +194,13 @@ const struct cdevsw utoppy_cdevsw = { #define UTOPPYUNIT(n) (minor(n)) -int utoppy_match(device_t, cfdata_t, void *); -void utoppy_attach(device_t, device_t, void *); -int utoppy_detach(device_t, int); -int utoppy_activate(device_t, enum devact); +int utoppy_match(device_t, cfdata_t, void *); +void utoppy_attach(device_t, device_t, void *); +int utoppy_detach(device_t, int); +int utoppy_activate(device_t, enum devact); extern struct cfdriver utoppy_cd; -CFATTACH_DECL_NEW(utoppy, sizeof(struct utoppy_softc), utoppy_match, utoppy_attach, utoppy_detach, utoppy_activate); +CFATTACH_DECL_NEW(utoppy, sizeof(struct utoppy_softc), utoppy_match, + utoppy_attach, utoppy_detach, utoppy_activate); int utoppy_match(device_t parent, cfdata_t match, void *aux) @@ -321,8 +322,7 @@ utoppy_attach(device_t parent, device_t self, void *aux) sc->sc_out_buf = usbd_get_buffer(sc->sc_out_xfer); sc->sc_in_buf = usbd_get_buffer(sc->sc_in_xfer); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); return; @@ -382,8 +382,7 @@ utoppy_detach(device_t self, int flags) mn = device_unit(self); vdevgone(maj, mn, mn, VCHR); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return 0; } @@ -577,7 +576,8 @@ utoppy_send_packet(struct utoppy_softc *sc, uint16_t cmd, uint32_t timeout) if (len >= UTOPPY_BSIZE) { DPRINTF(UTOPPY_DBG_SEND_PACKET, ("%s: utoppy_send_packet: " - "packet too big (%d)\n", device_xname(sc->sc_dev), (int)len)); + "packet too big (%d)\n", device_xname(sc->sc_dev), + (int)len)); return EINVAL; } @@ -645,7 +645,8 @@ utoppy_send_packet(struct utoppy_softc *sc, uint16_t cmd, uint32_t timeout) } while (err == 0 && len); DPRINTF(UTOPPY_DBG_SEND_PACKET, ("%s: utoppy_send_packet: " - "usbd_bulk_transfer() returned %d.\n", device_xname(sc->sc_dev),err)); + "usbd_bulk_transfer() returned %d.\n", + device_xname(sc->sc_dev),err)); return err ? utoppy_usbd_status2errno(err) : 0; } @@ -1400,8 +1401,7 @@ utoppyopen(dev_t dev, int flag, int mode, } int -utoppyclose(dev_t dev, int flag, int mode, - struct lwp *l) +utoppyclose(dev_t dev, int flag, int mode, struct lwp *l) { struct utoppy_softc *sc; usbd_status err; @@ -1413,8 +1413,8 @@ utoppyclose(dev_t dev, int flag, int mode, if (sc->sc_state < UTOPPY_STATE_IDLE) { /* We are being forced to close before the open completed. */ - DPRINTF(UTOPPY_DBG_CLOSE, ("%s: utoppyclose: not properly open:" - " %s\n", device_xname(sc->sc_dev), + DPRINTF(UTOPPY_DBG_CLOSE, ("%s: utoppyclose: not properly " + "open: %s\n", device_xname(sc->sc_dev), utoppy_state_string(sc->sc_state))); return 0; } @@ -1560,8 +1560,8 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) sc->sc_refcnt++; err = 0; - DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: PRE-WRITEFILE: resid %ld, " - "wr_size %lld, wr_offset %lld\n", device_xname(sc->sc_dev), + DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: PRE-WRITEFILE: resid " + "%ld, wr_size %lld, wr_offset %lld\n", device_xname(sc->sc_dev), (u_long)uio->uio_resid, sc->sc_wr_size, sc->sc_wr_offset)); while (sc->sc_state == UTOPPY_STATE_WRITEFILE && @@ -1578,8 +1578,8 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) err = uiomove(utoppy_current_ptr(sc->sc_out_data), len, uio); if (err) { - DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: uiomove() " - "returned %d\n", device_xname(sc->sc_dev), err)); + DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: uiomove()" + " returned %d\n", device_xname(sc->sc_dev), err)); break; } @@ -1607,9 +1607,10 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) sc->sc_wr_size -= len; } - DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: POST-WRITEFILE: resid %ld," - " wr_size %lld, wr_offset %lld, err %d\n", device_xname(sc->sc_dev), - (u_long)uio->uio_resid, sc->sc_wr_size, sc->sc_wr_offset, err)); + DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: POST-WRITEFILE: resid " + "%ld, wr_size %lld, wr_offset %lld, err %d\n", + device_xname(sc->sc_dev), (u_long)uio->uio_resid, sc->sc_wr_size, + sc->sc_wr_offset, err)); if (err == 0 && sc->sc_wr_size == 0) { DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: sending " @@ -1627,7 +1628,8 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) sc->sc_state = UTOPPY_STATE_IDLE; DPRINTF(UTOPPY_DBG_WRITE, ("%s: utoppywrite: state %s\n", - device_xname(sc->sc_dev), utoppy_state_string(sc->sc_state))); + device_xname(sc->sc_dev), + utoppy_state_string(sc->sc_state))); } if (--sc->sc_refcnt < 0) @@ -1669,8 +1671,8 @@ utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, err = 0; sc->sc_turbo_mode = *((int *)data) ? 1 : 0; DPRINTF(UTOPPY_DBG_IOCTL, ("%s: utoppyioctl: UTOPPYIOTURBO: " - "%s\n", device_xname(sc->sc_dev), sc->sc_turbo_mode ? "On" : - "Off")); + "%s\n", device_xname(sc->sc_dev), + sc->sc_turbo_mode ? "On" : "Off")); break; case UTOPPYIOCANCEL: @@ -1709,8 +1711,8 @@ utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, if ((err = utoppy_add_path(sc, ur->ur_new_path, 1)) != 0) break; - err = utoppy_command(sc, UTOPPY_CMD_RENAME, UTOPPY_LONG_TIMEOUT, - &resp); + err = utoppy_command(sc, UTOPPY_CMD_RENAME, + UTOPPY_LONG_TIMEOUT, &resp); if (err) break; @@ -1785,8 +1787,8 @@ utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, urf = (struct utoppy_readfile *)data; DPRINTF(UTOPPY_DBG_IOCTL,("%s: utoppyioctl: UTOPPYIOREADFILE " - "%s, offset %lld\n", device_xname(sc->sc_dev), urf->ur_path, - urf->ur_offset)); + "%s, offset %lld\n", device_xname(sc->sc_dev), + urf->ur_path, urf->ur_offset)); if ((err = utoppy_turbo_mode(sc, sc->sc_turbo_mode)) != 0) break; @@ -1823,8 +1825,8 @@ utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, uwfp = utoppy_current_ptr(sc->sc_out_data); if ((err = utoppy_add_path(sc, uw->uw_path, 1)) != 0) { - DPRINTF(UTOPPY_DBG_WRITE,("%s: utoppyioctl: add_path() " - "returned %d\n", device_xname(sc->sc_dev), err)); + DPRINTF(UTOPPY_DBG_WRITE,("%s: utoppyioctl: add_path()" + " returned %d\n", device_xname(sc->sc_dev), err)); break; } diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 6586d2faa69..441a8e8bd30 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $NetBSD: uvideo.c,v 1.42 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uvideo.c,v 1.43 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2008 Patrick Mahoney @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.42 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.43 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -608,8 +608,7 @@ uvideo_attach(device_t parent, device_t self, void *aux) } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -692,8 +691,7 @@ uvideo_detach(device_t self, int flags) if (sc->sc_videodev != NULL) rv = config_detach(sc->sc_videodev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); usbd_devinfo_free(sc->sc_devname); diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index 68334e41096..f11a7bcd571 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -1,4 +1,4 @@ -/* $NetBSD: uvisor.c,v 1.46 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uvisor.c,v 1.47 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.46 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.47 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -281,8 +281,7 @@ uvisor_attach(device_t parent, device_t self, void *aux) goto bad; } - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); if (sc->sc_flags & VISOR) { sc->sc_numcon = UGETW(coninfo.num_ports); diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index 34d432b6867..900a3e9e85d 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -1,4 +1,4 @@ -/* $NetBSD: uvscom.c,v 1.29 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: uvscom.c,v 1.30 2016/07/07 06:55:42 msaitoh Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.29 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.30 2016/07/07 06:55:42 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -355,11 +355,10 @@ uvscom_attach(device_t parent, device_t self, void *aux) DPRINTF(("uvscom: in = 0x%x out = 0x%x intr = 0x%x\n", ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number)); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); DPRINTF(("uplcom: in=0x%x out=0x%x intr=0x%x\n", - ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number )); + ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number )); sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa, ucomprint, ucomsubmatch); @@ -396,8 +395,7 @@ uvscom_detach(device_t self, int flags) if (sc->sc_subdev != NULL) rv = config_detach(sc->sc_subdev, flags); - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - sc->sc_dev); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return rv; } diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index 0e63b0a2c5a..671c7f00d50 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay.c,v 1.139 2015/08/24 22:50:33 pooka Exp $ */ +/* $NetBSD: wsdisplay.c,v 1.140 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.139 2015/08/24 22:50:33 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.140 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_wsdisplay_compat.h" @@ -841,7 +841,8 @@ wsdisplay_common_attach(struct wsdisplay_softc *sc, int console, int kbdmux, wsdisplay_addscreen_print(sc, start, i-start); if (!pmf_device_register(sc->sc_dev, wsdisplay_suspend, NULL)) - aprint_error_dev(sc->sc_dev, "couldn't establish power handler\n"); + aprint_error_dev(sc->sc_dev, + "couldn't establish power handler\n"); } void @@ -1921,7 +1922,8 @@ wsdisplay_switch1(device_t dv, int error, int waitok) panic("wsdisplay_switch1: invalid screen %d", no); scr = sc->sc_scr[no]; if (!scr) { - aprint_error_dev(dv, "wsdisplay_switch1: screen %d disappeared\n", no); + aprint_error_dev(dv, + "wsdisplay_switch1: screen %d disappeared\n", no); error = ENXIO; } diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c index 391da021956..c3fc774ef35 100644 --- a/sys/dev/wscons/wsmux.c +++ b/sys/dev/wscons/wsmux.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsmux.c,v 1.60 2015/08/24 22:50:33 pooka Exp $ */ +/* $NetBSD: wsmux.c,v 1.61 2016/07/07 06:55:42 msaitoh Exp $ */ /* * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.60 2015/08/24 22:50:33 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.61 2016/07/07 06:55:42 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -497,7 +497,8 @@ wsmux_do_ioctl(device_t dv, u_long cmd, void *data, int flag, case WSKBDIO_SETVERSION: case WSMOUSEIO_SETVERSION: case WSDISPLAYIO_SETVERSION: - DPRINTF(("%s: WSxxxIO_SETVERSION\n", device_xname(sc->sc_base.me_dv))); + DPRINTF(("%s: WSxxxIO_SETVERSION\n", + device_xname(sc->sc_base.me_dv))); evar = sc->sc_base.me_evp; if (evar == NULL) return (EINVAL); @@ -659,14 +660,15 @@ wsmux_create(const char *name, int unit) sc = malloc(sizeof *sc, M_DEVBUF, M_NOWAIT|M_ZERO); if (sc == NULL) return (NULL); - sc->sc_base.me_dv = malloc(sizeof(struct device), M_DEVBUF, M_NOWAIT|M_ZERO); + sc->sc_base.me_dv = malloc(sizeof(struct device), M_DEVBUF, + M_NOWAIT|M_ZERO); if (sc->sc_base.me_dv == NULL) { free(sc, M_DEVBUF); return NULL; } TAILQ_INIT(&sc->sc_cld); - snprintf(sc->sc_base.me_dv->dv_xname, sizeof sc->sc_base.me_dv->dv_xname, - "%s%d", name, unit); + snprintf(sc->sc_base.me_dv->dv_xname, + sizeof sc->sc_base.me_dv->dv_xname, "%s%d", name, unit); sc->sc_base.me_dv->dv_private = sc; sc->sc_base.me_dv->dv_unit = unit; sc->sc_base.me_ops = &wsmux_srcops; |
