KNF. Remove extra spaces. No functional change. trunk
authormsaitoh <msaitoh@NetBSD.org>
Thu, 07 Jul 2016 06:55:38 +0000
branchtrunk
changeset 243561 47d43e651eda
parent 243560 373769e6f0d2
child 243562 567cae9ff8cd
KNF. Remove extra spaces. No functional change.
sys/arch/sgimips/ioc/oiocsc.c
sys/arch/sgimips/sgimips/arcemu.h
sys/arch/shark/isa/clock.c
sys/arch/shark/ofw/ofw.c
sys/arch/shark/shark/i8042reg.h
sys/arch/shark/shark/ns87307.c
sys/arch/shark/shark/opms.c
sys/arch/shark/shark/profile.c
sys/arch/shark/shark/scr.c
sys/arch/shark/shark/sequoia.c
sys/arch/shark/shark/shark_machdep.c
sys/arch/shark/stand/ofwboot/boot.c
sys/arch/sparc/include/pci_machdep.h
sys/arch/sparc64/dev/ffb.c
sys/arch/sparc64/dev/fhc.c
sys/arch/sparc64/dev/gfb.c
sys/arch/sparc64/dev/psm.c
sys/arch/sparc64/dev/sbus.c
sys/arch/sparc64/dev/tda.c
sys/arch/sparc64/include/bus_defs.h
sys/arch/sparc64/include/pci_machdep.h
sys/arch/sparc64/sparc64/cache.c
sys/arch/sparc64/sparc64/clock.c
sys/arch/sparc64/sparc64/compat_16_machdep.c
sys/arch/sparc64/sparc64/machdep.c
sys/arch/sparc64/sparc64/ofw_machdep.c
sys/arch/sparc64/sparc64/pmap.c
sys/arch/sparc64/sparc64/sunos32_machdep.c
sys/arch/sparc64/sparc64/sunos_machdep.c
sys/arch/sparc64/sparc64/trap.c
sys/arch/sun2/dev/zsvar.h
sys/arch/sun2/sun2/mbio.c
sys/arch/sun2/sun2/mbmem.c
sys/arch/sun2/sun2/obio.c
sys/arch/sun2/sun2/obmem.c
sys/arch/sun2/sun2/tod.c
sys/arch/sun3/dev/if_ie.c
sys/arch/sun68k/sun68k/bus.c
sys/arch/usermode/usermode/pmap.c
sys/arch/vax/boot/boot/consio.c
sys/arch/vax/mba/hp.c
sys/arch/vax/uba/qv.c
sys/arch/vax/uba/qvaux.c
sys/arch/vax/vax/cfl.c
sys/arch/vax/vax/compat_13_machdep.c
sys/arch/vax/vax/crl.c
sys/arch/vax/vax/ctu.c
sys/arch/vax/vax/gencons.c
sys/arch/vax/vax/ka750.c
sys/arch/vax/vax/ka780.c
sys/arch/vax/vax/sgmap.c
sys/arch/vax/vax/trap.c
sys/arch/vax/vsa/asc_vsbus.c
sys/arch/vax/vsa/smg.c
sys/arch/vax/vsa/spx.c
sys/arch/vax/vsa/vsbus.c
sys/arch/x68k/dev/bmd.c
sys/arch/x86/include/intr.h
sys/arch/x86/pci/pci_ranges.c
sys/arch/x86/x86/coretemp.c
sys/arch/x86/x86/cpu.c
sys/arch/x86/x86/ipmi.c
sys/arch/x86/x86/mpacpi.c
sys/arch/x86/x86/syscall.c
sys/arch/xen/include/intr.h
sys/arch/xen/include/xen-public/arch-x86/xen-mca.h
sys/arch/xen/include/xen-public/domctl.h
sys/arch/xen/include/xen-public/io/blkif.h
sys/arch/xen/include/xen-public/physdev.h
sys/arch/xen/include/xen-public/sysctl.h
sys/arch/xen/include/xen.h
sys/arch/xen/include/xenio.h
sys/arch/xen/x86/cpu.c
sys/arch/xen/x86/xen_ipi.c
sys/arch/xen/xen/balloon.c
sys/arch/xen/xen/pciback.c
sys/arch/xen/xen/xen_debug.c
sys/arch/xen/xen/xenevt.c
sys/arch/xen/xenbus/xenbus_comms.c
sys/arch/xen/xenbus/xenbus_dev.c
sys/arch/xen/xenbus/xenbus_probe.c
sys/arch/zaurus/dev/zaudiovar.h
sys/arch/zaurus/zaurus/machdep.c
sys/coda/coda_psdev.c
sys/dev/acpi/sony_acpi.c
sys/dev/bluetooth/btmagic.c
sys/dev/cardbus/if_ex_cardbus.c
sys/dev/cardbus/if_fxp_cardbus.c
sys/dev/cardbus/if_rtw_cardbus.c
sys/dev/cardbus/ohci_cardbus.c
sys/dev/cardbus/uhci_cardbus.c
sys/dev/cgd.c
sys/dev/ic/adw.c
sys/dev/ic/aic6915.c
sys/dev/ic/cac.c
sys/dev/ic/dpt.c
sys/dev/ic/mlx.c
sys/dev/ic/opl.c
sys/dev/ic/smc91cxx.c
sys/dev/isa/adv_isa.c
sys/dev/midi.c
sys/dev/mii/acphy.c
sys/dev/mii/bmtphy.c
sys/dev/mii/ciphy.c
sys/dev/mii/dmphy.c
sys/dev/mii/exphy.c
sys/dev/mii/glxtphy.c
sys/dev/mii/gphyter.c
sys/dev/mii/icsphy.c
sys/dev/mii/igphy.c
sys/dev/mii/ihphy.c
sys/dev/mii/ikphy.c
sys/dev/mii/inphy.c
sys/dev/mii/iophy.c
sys/dev/mii/lxtphy.c
sys/dev/mii/makphy.c
sys/dev/mii/micphy.c
sys/dev/mii/nsphy.c
sys/dev/mii/nsphyter.c
sys/dev/mii/pnaphy.c
sys/dev/mii/qsphy.c
sys/dev/mii/rlphy.c
sys/dev/mii/sqphy.c
sys/dev/mii/tqphy.c
sys/dev/mii/ukphy.c
sys/dev/mii/urlphy.c
sys/dev/pad/pad.c
sys/dev/pci/aac_pci.c
sys/dev/pci/amr.c
sys/dev/pci/auich.c
sys/dev/pci/auixp.c
sys/dev/pci/autri.c
sys/dev/pci/bktr/bktr_os.c
sys/dev/pci/cmpci.c
sys/dev/pci/cs4280.c
sys/dev/pci/cs4281.c
sys/dev/pci/cy_pci.c
sys/dev/pci/cz.c
sys/dev/pci/eap.c
sys/dev/pci/emuxki.c
sys/dev/pci/esm.c
sys/dev/pci/eso.c
sys/dev/pci/fwohci_pci.c
sys/dev/pci/genfb_pci.c
sys/dev/pci/hdaudio_pci.c
sys/dev/pci/ichsmb.c
sys/dev/pci/if_bwi_pci.c
sys/dev/pci/if_dge.c
sys/dev/pci/if_esh_pci.c
sys/dev/pci/if_mtd_pci.c
sys/dev/pci/if_sf_pci.c
sys/dev/pci/if_sip.c
sys/dev/pci/if_ste.c
sys/dev/pci/if_stge.c
sys/dev/pci/if_ti.c
sys/dev/pci/if_tl.c
sys/dev/pci/if_tlp_pci.c
sys/dev/pci/if_vr.c
sys/dev/pci/isp_pci.c
sys/dev/pci/ld_virtio.c
sys/dev/pci/mly.c
sys/dev/pci/mpt_pci.c
sys/dev/pci/pccbb.c
sys/dev/pci/pciide_common.c
sys/dev/pci/puc.c
sys/dev/pci/rtsx_pci.c
sys/dev/pci/trm.c
sys/dev/pci/twa.c
sys/dev/pci/twe.c
sys/dev/pci/ubsec.c
sys/dev/pci/vga_pci.c
sys/dev/pci/viomb.c
sys/dev/pci/virtio.c
sys/dev/pci/weasel_pci.c
sys/dev/pcmcia/esp_pcmcia.c
sys/dev/pcmcia/if_cs_pcmcia.c
sys/dev/pcmcia/if_ep_pcmcia.c
sys/dev/pcmcia/if_mbe_pcmcia.c
sys/dev/pcmcia/if_ray.c
sys/dev/pcmcia/if_sm_pcmcia.c
sys/dev/pcmcia/if_wi_pcmcia.c
sys/dev/usb/if_aue.c
sys/dev/usb/if_kue.c
sys/dev/usb/if_rum.c
sys/dev/usb/if_udav.c
sys/dev/usb/if_upl.c
sys/dev/usb/if_ural.c
sys/dev/usb/if_url.c
sys/dev/usb/if_zyd.c
sys/dev/usb/moscom.c
sys/dev/usb/pseye.c
sys/dev/usb/slurm.c
sys/dev/usb/stuirda.c
sys/dev/usb/uark.c
sys/dev/usb/uaudio.c
sys/dev/usb/ubsa.c
sys/dev/usb/ubt.c
sys/dev/usb/uchcom.c
sys/dev/usb/ucycom.c
sys/dev/usb/udsbr.c
sys/dev/usb/udsir.c
sys/dev/usb/uftdi.c
sys/dev/usb/ugen.c
sys/dev/usb/ugensa.c
sys/dev/usb/uhid.c
sys/dev/usb/uhidev.c
sys/dev/usb/uhso.c
sys/dev/usb/uipaq.c
sys/dev/usb/uirda.c
sys/dev/usb/ukyopon.c
sys/dev/usb/ulpt.c
sys/dev/usb/umass.c
sys/dev/usb/umcs.c
sys/dev/usb/umct.c
sys/dev/usb/umidi.c
sys/dev/usb/umodem.c
sys/dev/usb/umodem_common.c
sys/dev/usb/uplcom.c
sys/dev/usb/urio.c
sys/dev/usb/uscanner.c
sys/dev/usb/uslsa.c
sys/dev/usb/usscanner.c
sys/dev/usb/ustir.c
sys/dev/usb/utoppy.c
sys/dev/usb/uvideo.c
sys/dev/usb/uvisor.c
sys/dev/usb/uvscom.c
sys/dev/wscons/wsdisplay.c
sys/dev/wscons/wsmux.c
sys/fs/efs/efs_dinode.h
sys/fs/efs/efs_dir.h
sys/fs/efs/efs_vfsops.c
sys/fs/efs/efs_vnops.c
sys/fs/nfs/common/nfs_fha.h
sys/fs/nfs/common/nfsm_subs.h
sys/fs/nfs/nlm/nlm.h
sys/fs/nilfs/nilfs_vfsops.c
sys/fs/puffs/puffs_msgif.c
sys/fs/puffs/puffs_sys.h
sys/fs/puffs/puffs_vnops.c
sys/fs/udf/udf_vfsops.c
sys/kern/init_main.c
sys/kern/kern_core.c
sys/kern/kern_ctf.c
sys/kern/kern_exec.c
sys/kern/kern_ksyms.c
sys/kern/kern_ktrace.c
sys/kern/kern_module.c
sys/kern/kern_mutex.c
sys/kern/kern_pmf.c
sys/kern/kern_runq.c
sys/kern/kern_time.c
sys/kern/subr_kobj.c
sys/kern/subr_vmem.c
sys/kern/sys_aio.c
sys/kern/sys_sched.c
sys/kern/sys_socket.c
sys/kern/tty.c
sys/kern/uipc_syscalls.c
sys/kern/vfs_cache.c
sys/kern/vfs_mount.c
sys/kern/vfs_vnode.c
sys/lib/libkern/libkern.h
sys/net/if_mpls.c
sys/net/if_pppoe.c
sys/net/route.c
sys/net80211/ieee80211_output.c
sys/net80211/ieee80211_proto.c
sys/net80211/ieee80211_rssadapt.c
sys/netinet/accf_data.c
sys/netinet/dccp_tcplike.h
sys/netinet/dccp_tfrc.c
sys/netinet/dccp_tfrc.h
sys/netinet/dccp_usrreq.c
sys/netinet/dccp_var.h
sys/netipsec/ipsec6.h
sys/netipsec/ipsec_netbsd.c
sys/nfs/nfs_boot.c
sys/opencrypto/crypto.c
sys/opencrypto/cryptodev.c
sys/opencrypto/cryptodev.h
sys/rump/dev/lib/libpci/pci_user.h
sys/rump/dev/lib/libpci/rumpdev_bus_space.c
sys/rump/librump/rumpkern/klock.c
sys/rump/librump/rumpvfs/rumpblk.c
sys/rump/librump/rumpvfs/rumpfs.c
sys/rump/net/lib/libshmif/if_shmem.c
sys/sys/mount.h
sys/sys/sdt.h
sys/sys/time.h
sys/sys/timepps.h
sys/sys/wait.h
sys/ufs/ffs/ffs_quota2.c
sys/ufs/lfs/lfs_vfsops.c
sys/ufs/lfs/ulfs_extattr.c
sys/ufs/lfs/ulfs_quota2.c
sys/ufs/ufs/ufs_extattr.c
sys/uvm/pmap/pmap.c
sys/uvm/pmap/pmap.h
sys/uvm/uvm_map.c
--- a/sys/arch/sgimips/ioc/oiocsc.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sgimips/ioc/oiocsc.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: oiocsc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $	*/
+/*	$NetBSD: oiocsc.c,v 1.3 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2009 Stephen M. Rumble
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1.3 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -124,7 +124,7 @@
 oiocsc_attach(device_t parent, device_t self, void *aux)
 {
 	struct oiocsc_softc *osc = device_private(self);
-	struct wd33c93_softc *sc = &osc->sc_wd33c93; 
+	struct wd33c93_softc *sc = &osc->sc_wd33c93;
 	struct oioc_attach_args *oa = aux;
 	int err;
 
--- a/sys/arch/sgimips/sgimips/arcemu.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sgimips/sgimips/arcemu.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: arcemu.h,v 1.12 2011/02/20 07:59:51 matt Exp $	*/
+/*	$NetBSD: arcemu.h,v 1.13 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2004 Steve Rumble 
@@ -54,7 +54,7 @@
 static void *	arcemu_GetPeer(void *);
 static void *	arcemu_GetChild(void *);
 static const char *
-		arcemu_GetEnvironmentVariable(const char *); 
+		arcemu_GetEnvironmentVariable(const char *);
 static void *	arcemu_ip6_GetMemoryDescriptor(void *mem);
 static void *	arcemu_ip12_GetMemoryDescriptor(void *mem);
 
--- a/sys/arch/shark/isa/clock.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/isa/clock.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.16 2007/10/17 19:57:09 garbled Exp $	*/
+/*	$NetBSD: clock.c,v 1.17 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright 1997
@@ -154,7 +154,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.16 2007/10/17 19:57:09 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.17 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -349,7 +349,7 @@
 	/* check to see if the high-availability timer needs to be unwedged */
 	if (++hatUnwedgeCtr >= (hz / HAT_MIN_FREQ)) {
 		hatUnwedgeCtr = 0;
-		hatUnwedge(); 
+		hatUnwedge();
 	}
 
 #ifdef TESTHAT
--- a/sys/arch/shark/ofw/ofw.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/ofw/ofw.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw.c,v 1.64 2015/10/17 16:34:43 jmcneill Exp $	*/
+/*	$NetBSD: ofw.c,v 1.65 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright 1997
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.64 2015/10/17 16:34:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.65 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -138,7 +138,7 @@
 paddr_t msgbufphys;
 
 /* for storage allocation, used to be local to ofw_construct_proc0_addrspace */
-static vaddr_t  virt_freeptr;	    
+static vaddr_t  virt_freeptr;
 
 int ofw_callbacks = 0;		/* debugging counter */
 
@@ -705,7 +705,7 @@
 	shark_isa_dma_nranges = nOFdmaranges;
 #endif
 
-	for (rangeidx = 0, dr = OFdmaranges; rangeidx < nOFdmaranges; 
+	for (rangeidx = 0, dr = OFdmaranges; rangeidx < nOFdmaranges;
 	    ++rangeidx, ++dr) {
 		dr->start = of_decode_int((unsigned char *)&dr->start);
 		dr->size = of_decode_int((unsigned char *)&dr->size);
@@ -795,7 +795,7 @@
 
 		/* physmem, physical_start, physical_end */
 		physmem = 0;
-		for (totalcnt = 0, mp = OFphysmem; totalcnt < nOFphysmem; 
+		for (totalcnt = 0, mp = OFphysmem; totalcnt < nOFphysmem;
 		    totalcnt++, mp++) {
 #ifdef	OLDPRINTFS
 			printf("physmem: %x, %x\n", mp->start, mp->size);
@@ -1828,7 +1828,7 @@
 			newSize = (*ppLeftover)->size - size; /* reduce size */
 			/* move pointer */
 			*ppLeftover = (PLEFTOVER)(((vaddr_t)*ppLeftover)
-			    + size); 
+			    + size);
 			(*ppLeftover)->pNext = pLeft;
 			(*ppLeftover)->size  = newSize;
 		}
--- a/sys/arch/shark/shark/i8042reg.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/i8042reg.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: i8042reg.h,v 1.5 2009/03/14 14:46:07 dsl Exp $     */
+/*      $NetBSD: i8042reg.h,v 1.6 2016/07/07 06:55:38 msaitoh Exp $     */
 
 /*
  * Copyright 1997
@@ -140,7 +140,7 @@
 ** Forward routine declarations
 */
 extern void i8042_flush(bus_space_tag_t,
-                                   bus_space_handle_t); 
+                                   bus_space_handle_t);
 extern int  i8042_cmd(bus_space_tag_t,
                                    bus_space_handle_t,
                                    u_char,
--- a/sys/arch/shark/shark/ns87307.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/ns87307.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns87307.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $	*/
+/*	$NetBSD: ns87307.c,v 1.7 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright 1997
@@ -57,7 +57,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.7 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opt_ddb.h"
 
@@ -122,7 +122,7 @@
 		u_int           irqNum )
 {
     u_int                configured = false;
-    bus_space_handle_t   ioh;	     
+    bus_space_handle_t   ioh;
 
 
     if (!(bus_space_map( iot, CONNSIOADDR, NSIO_NPORTS, 0 , &ioh )))
@@ -133,7 +133,7 @@
 	NSIO_CONFIG_KBCDATA( iot, ioh, kbdBase );
 	NSIO_CONFIG_KBCCMD(iot, ioh, kbdBase+4);
 	NSIO_WRITE_REG( iot, ioh, NSIO_KBC_CFG, 0x80 );
-	NSIO_ACTIVATE_DEV( iot, ioh ); 
+	NSIO_ACTIVATE_DEV( iot, ioh );
 	NSIO_CONFIG_KBCDEBUG( iot, ioh );
 
 	/* unmap the space so can probe later
@@ -189,7 +189,7 @@
 		  u_int           irqNum )
 {
     u_int                configured;
-    bus_space_handle_t   ioh;	     
+    bus_space_handle_t   ioh;
 
     configured = false; /* be a pessimist */
 
@@ -198,7 +198,7 @@
 	/* Now do the mouse logical device IRQ settup.
 	*/
 	NSIO_SELECT_DEV( iot, ioh, NSIO_DEV_MOUSE );
-	NSIO_DEACTIVATE_DEV( iot, ioh );   
+	NSIO_DEACTIVATE_DEV( iot, ioh );
 	NSIO_CONFIG_IRQ( iot, ioh, irqNum, NSIO_IRQ_LEVEL | NSIO_IRQ_HIGH);
 	NSIO_ACTIVATE_DEV( iot, ioh );
 	NSIO_CONFIG_DEBUG( iot, ioh );
@@ -255,7 +255,7 @@
 		  u_int           irqNum )
 {
     u_int                configured = false;
-    bus_space_handle_t   ioh;	     
+    bus_space_handle_t   ioh;
 
     u_char value;
  
@@ -278,7 +278,7 @@
         NSIO_CONFIG_IRQ( iot, ioh, irqNum,value);
     
     	/* activate the device */
-    	NSIO_ACTIVATE_DEV( iot, ioh ); 
+    	NSIO_ACTIVATE_DEV( iot, ioh );
         
         
         /* unmap the space so can probe later */
@@ -331,36 +331,36 @@
 void nsioConfigPrint(bus_space_tag_t nsioIot, 
                      bus_space_handle_t  nsioIoh )                        
 {                                                                       
-    u_char     dev;                                                     
-    u_char     activate;                                                
-    u_char     iorange;                                                 
-    u_char     iobaseh;                                                 
-    u_char     iobasel;                                                 
-    u_char     irq;                                                     
-    u_char     irqType;                                                 
-    u_char     dma1;                                                    
-    u_char     dma2;                                                    
-    u_char     reg0;                                                    
-                                                                        
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_LOGDEV, dev );            
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_ACTIVATE, activate );     
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IORNGCHK, iorange );      
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IOBASEH, iobaseh );       
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IOBASEL, iobasel );       
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IRQ, irq );               
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IRQTYPE, irqType );       
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_DMA1, dma1 );             
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_DMA2, dma2 );             
-    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_REG0, reg0 );             
-                                                                        
-    printf("nsio config for logical device %d\n", dev );                
-    printf("activate:   %x\n",activate);                                
-    printf("iorange:    %x\n",iorange);                                 
-    printf("iobase:     %x\n",(iobaseh << 8) | iobasel);                
-    printf("irq:        %x\n",irq);                                           
-    printf("irqtype:    %x\n",irqType);                                 
-    printf("dma1:       %x\n",dma1);                                    
-    printf("dma2:       %x\n",dma2) ;                                   
-    printf("reg0:       %x\n",reg0);                                    
-}  
+    u_char     dev;
+    u_char     activate;
+    u_char     iorange;
+    u_char     iobaseh;
+    u_char     iobasel;
+    u_char     irq;
+    u_char     irqType;
+    u_char     dma1;
+    u_char     dma2;
+    u_char     reg0;
+
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_LOGDEV, dev );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_ACTIVATE, activate );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IORNGCHK, iorange );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IOBASEH, iobaseh );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IOBASEL, iobasel );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IRQ, irq );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IRQTYPE, irqType );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_DMA1, dma1 );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_DMA2, dma2 );
+    NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_REG0, reg0 );
+
+    printf("nsio config for logical device %d\n", dev );
+    printf("activate:   %x\n",activate);
+    printf("iorange:    %x\n",iorange);
+    printf("iobase:     %x\n",(iobaseh << 8) | iobasel);
+    printf("irq:        %x\n",irq);
+    printf("irqtype:    %x\n",irqType);
+    printf("dma1:       %x\n",dma1);
+    printf("dma2:       %x\n",dma2) ;
+    printf("reg0:       %x\n",reg0);
+}
 //#endif
--- a/sys/arch/shark/shark/opms.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/opms.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: opms.c,v 1.27 2014/10/18 08:33:26 snj Exp $        */
+/*      $NetBSD: opms.c,v 1.28 2016/07/07 06:55:38 msaitoh Exp $        */
 
 /*
  * Copyright 1997
@@ -91,7 +91,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.27 2014/10/18 08:33:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.28 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opms.h"
 #if NOPMS > 1
@@ -220,7 +220,7 @@
 /* variable to control which debugs printed if kernel compiled with 
 ** option KERNEL_DEBUG. 
 */
-int opmsdebug = KERN_DEBUG_WARNING | KERN_DEBUG_ERROR; 
+int opmsdebug = KERN_DEBUG_WARNING | KERN_DEBUG_ERROR;
 
 
 /*
@@ -263,8 +263,8 @@
 {
     struct cfdata             *cf     = match;
     int                       probeOk = 0;    /* assume failure */
-    struct isa_attach_args    *ia = aux;                   
-    
+    struct isa_attach_args    *ia = aux;
+
     KERN_DEBUG(opmsdebug, KERN_DEBUG_INFO, ("opmsprobe: entered\n"));
     /*
     ** We only attach to the keyboard controller via
@@ -361,7 +361,7 @@
 {
     struct opms_softc         *sc = device_private(self);
     int                       irq = device_cfdata(self)->cf_loc[SPCKBDCF_IRQ];
-    struct isa_attach_args    *ia = aux;                   
+    struct isa_attach_args    *ia = aux;
 
     printf(" irq %d\n", irq);
     /* 
@@ -443,13 +443,13 @@
     } 
     sc->sc_state |= PMS_OPEN;
     sc->sc_status = 0;
-    sc->sc_x      = 0; 
+    sc->sc_x      = 0;
     sc->sc_y      = 0;
     /* Enable the device both in the mouse and in the keyboard after making
     ** sure there isn't any garbage in the input buffer.
     */
     i8042_flush(sc->sc_iot, sc->sc_ioh);
-    sc->sc_protocol_byte = PMS_RD_BYTE1; 
+    sc->sc_protocol_byte = PMS_RD_BYTE1;
     (void) i8042_cmd(sc->sc_iot, sc->sc_ioh, I8042_AUX_CMD, 
                          I8042_NO_RESPONSE, 0, PMS_MOUSE_ENABLE);
     (void) I8042_AUXENABLE(sc->sc_iot, sc->sc_ioh);
@@ -663,7 +663,7 @@
 #else
         case MOUSEIOCREAD:
 #endif
-            oldIpl = spltty();  
+            oldIpl = spltty();
             info.status = sc->sc_status;
             if (sc->sc_x || sc->sc_y)
             {
@@ -766,8 +766,8 @@
     u_char               status;
     u_char               buffer[5];
     int                  handledInt;
-    bus_space_tag_t      iot;        
-    bus_space_handle_t   ioh;        
+    bus_space_tag_t      iot;
+    bus_space_handle_t   ioh;
     static signed char   dx;
     static signed char   dy;
     u_char               value = 0;	/* XXX */
@@ -907,7 +907,7 @@
 **
 **     This routine is used to poll the device for the presence of a set 
 **     of events (e.g. is there data to be read).  If any of the polled 
-**     for events are present on the device, then these events are returned; 
+**     for events are present on the device, then these events are returned;
 **     otherwise the process is marked as waiting for the set of events
 **
 **  FORMAL PARAMETERS:
@@ -938,7 +938,7 @@
 {
     struct opms_softc     *sc     = device_lookup_private(&opms_cd, PMSUNIT(dev));
     int                  revents = 0;
-    int                  oldIpl; 
+    int                  oldIpl;
 
     oldIpl = spltty();
     
--- a/sys/arch/shark/shark/profile.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/profile.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: profile.c,v 1.16 2014/07/25 08:10:34 dholland Exp $	*/
+/*	$NetBSD: profile.c,v 1.17 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright 1997
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: profile.c,v 1.16 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: profile.c,v 1.17 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "profiler.h"
 
@@ -167,7 +167,7 @@
 	return EROFS;
     }
     /* flag the device as open. */
-    prof_sc.state |= PROF_OPEN; 
+    prof_sc.state |= PROF_OPEN;
     nhashTables = 0;
     phashTables[0] = phashTables[1] = NULL;
     return 0;
@@ -385,7 +385,7 @@
 	     (int)&prof_sc,
 	     hatStack + HATSTACKSIZE - sizeof(unsigned),
 	     profHatWedge);
-    restore_interrupts(savedInts); 
+    restore_interrupts(savedInts);
 }
 
 void
@@ -396,7 +396,7 @@
 
     savedInts = disable_interrupts(I32_bit | F32_bit);
     hatClkOff();
-    restore_interrupts(savedInts); 
+    restore_interrupts(savedInts);
 
     spl = splbio();
     /* only free the buffer's if we were profiling,
--- a/sys/arch/shark/shark/scr.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/scr.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: scr.c,v 1.30 2014/07/25 08:10:34 dholland Exp $	*/
+/*	$NetBSD: scr.c,v 1.31 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright 1997
@@ -102,7 +102,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.30 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.31 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opt_ddb.h"
 
@@ -168,7 +168,7 @@
     #define KERNEL_DEBUG
     #define ASSERT(f)	        do { if (!(f)) { DEBUGGER;} }while(0)
     #define TOGGLE_TEST_PIN()   scrToggleTestPin()
-    #define INVALID_STATE_CMD(sc,state,cmd)  invalidStateCmd(sc,state,cmd,__LINE__); 
+    #define INVALID_STATE_CMD(sc,state,cmd)  invalidStateCmd(sc,state,cmd,__LINE__);
 #else
     #define ASSERT(f)
     #define TOGGLE_TEST_PIN()
@@ -507,14 +507,14 @@
 static int devices = 0;
 
 /* used as reference for tsleep */
-static int tsleepIdent;   
+static int tsleepIdent;
 
 
 /* 
 ** only 1 device is using the hat at any one time
 ** variable below must be acquired using splhigh before using the hat
 */
-static int hatLock = false;     
+static int hatLock = false;
 
 
 
@@ -579,7 +579,7 @@
 int     scrprobe(device_t, cfdata_t, void *);
 void    scrattach(device_t, device_t, void *);
 
-static void   initStates(struct scr_softc * sc); 
+static void   initStates(struct scr_softc * sc);
 
 
 
@@ -604,7 +604,7 @@
 static void   t0SendByteSM(struct scr_softc * sc,int cnd);
 static void   t0RecvByteSM(struct scr_softc * sc,int cnd);
 
-static void   cardOff(struct scr_softc * sc);              
+static void   cardOff(struct scr_softc * sc);
 
 /* 
 ** functions used for our own timeout routines.
@@ -615,9 +615,9 @@
 static void scrClkStart(struct scr_softc* sc,int countPerTick);
 static void scrClkAdj(int count);
 static void scrClkStop(void);
-static void hatClkIrq(int count);               
-
-static void scrTimeout(void (*func)(struct scr_softc*,int), struct scr_softc*, int arg, int count);  
+static void hatClkIrq(int count);
+
+static void scrTimeout(void (*func)(struct scr_softc*,int), struct scr_softc*, int arg, int count);
 static void scrUntimeout(void (*func)(struct scr_softc*,int), struct scr_softc*, int arg);
 
 
@@ -693,7 +693,7 @@
 scrprobe(device_t parent, cfdata_t match, void *aux)
 {
     struct isa_attach_args  *ia = aux;
-    int                     rv = 0;           
+    int                     rv = 0;
 
     KERN_DEBUG (scrdebug, SCRPROBE_DEBUG_INFO,("scrprobe: called, name = %s\n",
                                                device_cfdata(parent)->cf_name));
@@ -701,7 +701,7 @@
     if (device_is_a(parent, "ofisascr") && devices == 0)
     {
         /* set "devices" to ensure that we respond only once */
-        devices++;      
+        devices++;
 
         /* tell the caller that we are not using any resource */
 	ia->ia_nio = 0;
@@ -810,13 +810,13 @@
 */
 static void initStates(struct scr_softc * sc)
 {
-    sc->masterS         = msIdleOff;    
-    sc->t0RecvS         = t0rsIdle;         
-    sc->t0SendS         = t0ssIdle;         
-    sc->coldResetS      = crsIdle;          
-    sc->ATRS            = atrsIdle;         
-    sc->t0RecvByteS     = t0rbsIdle;            
-    sc->t0SendByteS     = t0sbsIdle;            
+    sc->masterS         = msIdleOff;
+    sc->t0RecvS         = t0rsIdle;
+    sc->t0SendS         = t0ssIdle;
+    sc->coldResetS      = crsIdle;
+    sc->ATRS            = atrsIdle;
+    sc->t0RecvByteS     = t0rbsIdle;
+    sc->t0SendByteS     = t0sbsIdle;
 }
 
 
@@ -1055,7 +1055,7 @@
                 savedInts = disable_interrupts(I32_bit | F32_bit);
                 if (sc->masterS == msIdleOn)
                 {
-                    pIoctlStatus->status = CARD_ON;   
+                    pIoctlStatus->status = CARD_ON;
                 }
                 else
                 {
@@ -1090,7 +1090,7 @@
                 }
                 splx(s);
         
-                tsleep(&tsleepIdent ,PZERO,"hat", 1); 
+                tsleep(&tsleepIdent ,PZERO,"hat", 1);
             }
             
             
@@ -1121,7 +1121,7 @@
                 
                 // start bottom half
                 scrClkStart (sc,400);
-                savedInts = disable_interrupts(I32_bit | F32_bit);     
+                savedInts = disable_interrupts(I32_bit | F32_bit);
                 masterSM(sc,mcOn);
                 restore_interrupts(savedInts);
                 
@@ -1159,7 +1159,7 @@
 
                     
                     // wait for a while 
-                    tsleep(&tsleepIdent ,PZERO,"hat", 1);  
+                    tsleep(&tsleepIdent ,PZERO,"hat", 1);
                 }
 
 
@@ -1170,7 +1170,7 @@
                 /* need to fix up count bits in non hat interrupt time, so */
                 if (sc->status == ERROR_OK)
                 {
-                    sc->clkCountStartRecv = CLK_COUNT_START;  
+                    sc->clkCountStartRecv = CLK_COUNT_START;
                     sc->clkCountDataRecv  = sc->clkCountStartRecv * START_2_DATA;
                     sc->clkCountDataSend  = CLK_COUNT_DATA;
                 }
@@ -1198,7 +1198,7 @@
             // david,jim hack to stop ioctl memcpy problem, to be removed when problem fixed ejg
             if (sc->pIoctlOn->status != ERROR_OK)
             {
-                sc->pIoctlOn->atrLen = 0; 
+                sc->pIoctlOn->atrLen = 0;
             }
             break;
         
@@ -1234,7 +1234,7 @@
                 }
                 splx(s);
                 
-                tsleep(&tsleepIdent ,PZERO,"hat", 1); 
+                tsleep(&tsleepIdent ,PZERO,"hat", 1);
             }
             
             // check to see if the card is in
@@ -1263,7 +1263,7 @@
                 
                 // start bottom half
                 scrClkStart (sc,sc->clkCountDataSend);
-                savedInts = disable_interrupts(I32_bit | F32_bit); 
+                savedInts = disable_interrupts(I32_bit | F32_bit);
                 if (sc->pIoctlT0->writeBuffer)
                 {
                     masterSM(sc,mcT0DataSend);
@@ -1308,8 +1308,8 @@
 
                     
                     // wait for a while 
-                    tsleep(&tsleepIdent ,PZERO,"hat", 1); 
-                }
+                    tsleep(&tsleepIdent ,PZERO,"hat", 1);
+	       }
 
                 // stop bottom half
                 scrClkStop();
@@ -1331,7 +1331,7 @@
             // david, jim hack to stop ioctl memcpy problem, to be removed when problem fixed ejg
             if (sc->pIoctlT0->status != ERROR_OK)
             {
-                sc->pIoctlT0->dataLen = 0;   
+                sc->pIoctlT0->dataLen = 0;
             }
             break;
 
@@ -1430,15 +1430,15 @@
                         */
                         
                         /* set initial values */
-                        sc->status          = 0;        
-                        sc->convention      = CONVENTION_UNKNOWN;            
-                        sc->protocolType    = 0;        
-                        sc->N               = N_DEFAULT;    
-                        sc->Fi              = Fi_DEFAULT;   
-                        sc->Di              = Di_DEFAULT;   
-                        sc->Wi              = Wi_DEFAULT;   
+                        sc->status          = 0;
+                        sc->convention      = CONVENTION_UNKNOWN;
+                        sc->protocolType    = 0;
+                        sc->N               = N_DEFAULT;
+                        sc->Fi              = Fi_DEFAULT;
+                        sc->Di              = Di_DEFAULT;
+                        sc->Wi              = Wi_DEFAULT;
                         sc->cardFreq        = CARD_FREQ_DEF;
-                        sc->clkCountStartRecv = CLK_COUNT_START;  
+                        sc->clkCountStartRecv = CLK_COUNT_START;
                         sc->clkCountDataRecv  = sc->clkCountStartRecv * START_2_DATA;
                         sc->clkCountDataSend  = CLK_COUNT_DATA;
                         
@@ -1517,7 +1517,7 @@
                     ** card is on, and we want to T0 Send, so 
                     ** as t0SendSM to do work 
                     */
-                    sc->status  = ERROR_OK;        
+                    sc->status  = ERROR_OK;
                     sc->masterS = msT0Send;
                     t0SendSM(sc,t0scStart);
                     break;
@@ -1527,7 +1527,7 @@
                     ** card is on, and we want to T0 Recv, so 
                     ** as t0RecvSM to do work 
                     */
-                    sc->status  = ERROR_OK;        
+                    sc->status  = ERROR_OK;
                     sc->masterS = msT0Recv;
                     t0RecvSM(sc,t0rcStart);
                     break;
@@ -1642,8 +1642,8 @@
         switch(cmd)
         {
             case t0scTWorkWaiting:
-                ASSERT(sc->t0SendS != t0ssIdle); 
-                
+                ASSERT(sc->t0SendS != t0ssIdle);
+
                 /* kill all lower machines */
                 t0SendByteSM(sc,t0sbcAbort);
                 t0RecvByteSM(sc,t0rbcAbort);
@@ -1664,7 +1664,7 @@
         }
 
         /* change states */
-        sc->t0SendS = t0ssIdle;   
+        sc->t0SendS = t0ssIdle;
         masterSM(sc,mcT0Send);
         return;
     }
@@ -1678,7 +1678,7 @@
                     /* set initial values */
                     sc->t0SendS = t0ssSendHeader;
                     sc->t0ByteParent = t0SendSM;
-                    sc->commandCount = 0;   
+                    sc->commandCount = 0;
                     sc->dataCount = 0;
                     sc->dataMax = sc->pIoctlT0->command[CMD_BUF_DATA_LEN_OFF];
                     sc->dataByte = sc->pIoctlT0->command[sc->commandCount];
@@ -1732,7 +1732,7 @@
                         sc->t0SendS = t0ssSendData;
                         sc->dataByte = sc->pIoctlT0->data[sc->dataCount];
                         t0SendByteSM(sc,t0sbcStart);
-                        sc->dataCount++;    
+                        sc->dataCount++;
                     }
 
                     /* see if we should send one data byte */
@@ -1743,7 +1743,7 @@
                         sc->t0SendS = t0ssSendByte;
                         sc->dataByte = sc->pIoctlT0->data[ sc->dataCount];
                         t0SendByteSM(sc,t0sbcStart);
-                        sc->dataCount++;    
+                        sc->dataCount++;
                     }
 
                     /* see if we should extend the work waiting period */
@@ -1825,7 +1825,7 @@
                         sc->t0SendS = t0ssSendData;
                         sc->dataByte = sc->pIoctlT0->data[ sc->dataCount];
                         t0SendByteSM(sc,t0sbcStart);
-                        sc->dataCount++;    
+                        sc->dataCount++;
                     }
 
                     /* wait for sw1 byte */
@@ -1940,8 +1940,8 @@
         {
     
             case t0rcTWorkWaiting:
-                ASSERT(sc->t0RecvS != t0rsIdle); 
-                
+                ASSERT(sc->t0RecvS != t0rsIdle);
+
                 /* kill all lower level machines */
                 t0SendByteSM(sc,t0sbcAbort);
                 t0RecvByteSM(sc,t0rbcAbort);
@@ -1965,7 +1965,7 @@
 
 
         /* change state */
-        sc->t0RecvS = t0rsIdle;   
+        sc->t0RecvS = t0rsIdle;
         masterSM(sc,mcT0Recv);
 
         /* all done */
@@ -1981,7 +1981,7 @@
                     /* set initial values */
                     sc->t0RecvS = t0rsSendHeader;
                     sc->t0ByteParent = t0RecvSM;
-                    sc->commandCount = 0;   
+                    sc->commandCount = 0;
                     sc->dataCount = 0;
                     sc->dataMax = sc->pIoctlT0->command[CMD_BUF_DATA_LEN_OFF];
                     if (sc->dataMax == 0)
@@ -2100,7 +2100,7 @@
                     /* clock in byte */
                     scrUntimeout(t0RecvSM, sc,t0rcTWorkWaiting);
                     sc->pIoctlT0->data[sc->dataCount] = sc->dataByte;
-                    sc->dataCount++;    
+                    sc->dataCount++;
 
 
                     if (sc->dataCount < sc->dataMax)
@@ -2133,7 +2133,7 @@
                     /* clock in data */
                     scrUntimeout(t0RecvSM, sc,t0rcTWorkWaiting);
                     sc->pIoctlT0->data[sc->dataCount] = sc->dataByte;
-                    sc->dataCount++;    
+                    sc->dataCount++;
 
                     /* decide if we have all data */
                     if (sc->dataCount >= sc->dataMax)
@@ -2178,7 +2178,7 @@
                     scrUntimeout(t0RecvSM, sc,t0rcTWorkWaiting);
                     sc->pIoctlT0->sw2 = sc->dataByte;
 
-                    sc->t0RecvS = t0rsIdle; 
+                    sc->t0RecvS = t0rsIdle;
                     masterSM(sc,mcT0Recv);
                     break;
 
@@ -2263,7 +2263,7 @@
 
                     /* tell master state machine that we are all done */
                     sc->coldResetS = crsIdle;
-                    masterSM(sc,mcColdReset);       
+                    masterSM(sc,mcColdReset);
                     break;
 
                 default:
@@ -2401,7 +2401,7 @@
             {
                 case gcT0RecvByte:
                     scrUntimeout(ATRSM,sc,atrcT3);
-                    sc->pIoctlOn->atrBuf[sc->pIoctlOn->atrLen] = sc->dataByte;  
+                    sc->pIoctlOn->atrBuf[sc->pIoctlOn->atrLen] = sc->dataByte;
                     sc->pIoctlOn->atrLen++;
                     if(sc->pIoctlOn->atrLen >= ATR_BUF_MAX)
                     {
@@ -2456,7 +2456,7 @@
                         /* if there are no TDx following set T0 protocol */
                         if (!ISSET(sc->atrY,ATR_Y_TD))
                         {
-                            sc->protocolType    = PROTOCOL_T0;      
+                            sc->protocolType    = PROTOCOL_T0;
                         }
     
     
@@ -2773,7 +2773,7 @@
         scrUntimeout(t0RecvByteSM, sc,t0rbcTErrorStop);
 
         scrSetDataHighZ();
-        sc->t0RecvByteS = t0rbsIdle; 
+        sc->t0RecvByteS = t0rbsIdle;
         return;
     }
 
@@ -2788,7 +2788,7 @@
                     sc->shiftBits   = 0;
                     sc->shiftByte   = 0;
                     sc->shiftParity = 0;
-                    sc->shiftParityCount = 0; 
+                    sc->shiftParityCount = 0;
                     scrClkAdj(sc->clkCountStartRecv); /* recv data clock running at 5 times */
 
                     /* check if start bit is already here */
@@ -2828,7 +2828,7 @@
                     else
                     {
                         /* found start bit, look for mid bit */
-                        scrTimeout(t0RecvByteSM,sc,t0rbcTFindStartMid,sc->clkCountStartRecv * 2); 
+                        scrTimeout(t0RecvByteSM,sc,t0rbcTFindStartMid,sc->clkCountStartRecv * 2);
                         sc->t0RecvByteS = t0rbsFindStartMid;
                     }
                     break;
@@ -2909,9 +2909,9 @@
                         {
                             /* adjust counts down to 1/2 freq */
                             sc->cardFreq        = CARD_FREQ_DEF / 2;
-                            sc->clkCountStartRecv   = sc->clkCountStartRecv *2; 
-                            sc->clkCountDataRecv    = sc->clkCountDataRecv  *2;  
-                            sc->clkCountDataSend    = sc->clkCountDataSend  *2;  
+                            sc->clkCountStartRecv   = sc->clkCountStartRecv *2;
+                            sc->clkCountDataRecv    = sc->clkCountDataRecv  *2;
+                            sc->clkCountDataSend    = sc->clkCountDataSend  *2;
 
 
                             /* adjust this so that we have clocked in only fist bit of TS */
@@ -3440,7 +3440,7 @@
 */
 static void scrClkStart(struct scr_softc * sc,int countPerTick)
 {
-    u_int savedInts; 
+    u_int savedInts;
 
     savedInts = disable_interrupts(I32_bit | F32_bit);
 
@@ -3491,7 +3491,7 @@
 */
 static void scrClkAdj (int count)
 {   
-    u_int savedInts; 
+    u_int savedInts;
 
     if (count != scrClkCount)
     {
@@ -3538,7 +3538,7 @@
 */
 static void scrClkStop(void)
 {
-    u_int savedInts; 
+    u_int savedInts;
     savedInts = disable_interrupts(I32_bit | F32_bit);
 
     ASSERT(scrClkEnable);
@@ -3986,10 +3986,10 @@
 
             /* states in in TO Recv Byte state machine */
         case    t0rbsIdle:          return "t0rbsIdle";
-        case    t0rbsFindStartEdge: return "t0rbcFindStartEdge";    
-        case    t0rbsFindStartMid:  return "t0rbcFindStartMid"; 
-        case    t0rbsClockData:     return "t0rbcClockData";    
-        case    t0rbsSendError:     return "t0rbcSendError";    
+        case    t0rbsFindStartEdge: return "t0rbcFindStartEdge";
+        case    t0rbsFindStartMid:  return "t0rbcFindStartMid";
+        case    t0rbsClockData:     return "t0rbcClockData";
+        case    t0rbsSendError:     return "t0rbcSendError";
 
 
             /* commands to T0 Send Byte  state machine */
--- a/sys/arch/shark/shark/sequoia.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/sequoia.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sequoia.c,v 1.12 2011/07/19 15:07:43 dyoung Exp $	*/
+/*	$NetBSD: sequoia.c,v 1.13 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright 1997
@@ -40,7 +40,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequoia.c,v 1.12 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequoia.c,v 1.13 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -172,20 +172,20 @@
     /*
     ** setup the pins associated with the led
     */
-    sequoiaRead(SEQR_SEQPSR1_REG,&seqReg); 
+    sequoiaRead(SEQR_SEQPSR1_REG,&seqReg);
     SET(seqReg,SEQPSR1_M_TAGDEN);           /* enable pc[4:9] */
-    sequoiaWrite(SEQR_SEQPSR1_REG,seqReg); 
+    sequoiaWrite(SEQR_SEQPSR1_REG,seqReg);
 
     
-    sequoiaRead(SEQR_SEQPSR3_REG,&seqReg); 
+    sequoiaRead(SEQR_SEQPSR3_REG,&seqReg);
     CLR(seqReg,SEQPSR3_M_PC5PINEN);      /* enable pc5, biled */
     CLR(seqReg,SEQPSR3_M_PC6PINEN);      /* enable pc6, biled */
     CLR(seqReg,SEQPSR3_M_PC7PINEN);      /* enable pc7, debug led yellow */
     CLR(seqReg,SEQPSR3_M_PC8PINEN);      /* enable pc8, debug led green  */
-    sequoiaWrite(SEQR_SEQPSR3_REG,seqReg); 
+    sequoiaWrite(SEQR_SEQPSR3_REG,seqReg);
     
     sequoiaRead (PMC_FOMPCR_REG, &seqReg);
-    CLR(seqReg,LED_BILED_YELLOW_BIT); 
+    CLR(seqReg,LED_BILED_YELLOW_BIT);
     CLR(seqReg,LED_BILED_GREEN_BIT);
     SET(seqReg,LED_DEBUG_YELLOW_BIT);
     CLR(seqReg,LED_DEBUG_GREEN_BIT);
@@ -245,8 +245,8 @@
      /* setup the wak0 pin to be detect */
     sequoiaRead(SEQR_SEQPSR2_REG,&seqReg);
 
-    SET(seqReg,SEQPSR2_M_DIRTYPINEN); 
-    SET(seqReg,SEQPSR2_M_GPIOB0PINEN); 
+    SET(seqReg,SEQPSR2_M_DIRTYPINEN);
+    SET(seqReg,SEQPSR2_M_GPIOB0PINEN);
 
     sequoiaWrite(SEQR_SEQPSR2_REG,seqReg);
 
@@ -272,7 +272,7 @@
 void consXTvOn(void)
 {
     u_int16_t savedPSR3;
-    u_int16_t savedFMPCR;  
+    u_int16_t savedFMPCR;
     /* 
     ** Switch on TV output on the Sequoia, data indicates mode,
     ** but we are currently hardwired to NTSC, so ignore it.
@@ -289,7 +289,7 @@
 void consXTvOff(void)
 {
     u_int16_t savedPSR3;
-    u_int16_t savedFMPCR;  
+    u_int16_t savedFMPCR;
     /* 
     ** Switch off TV output on the Seqoia 
     */
@@ -332,7 +332,7 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
 
     sequoiaRead(SEQUOIA_1GPIO,&seqReg);
@@ -357,7 +357,7 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
 
     sequoiaRead(SEQUOIA_2GPIO,&seqReg);
@@ -381,7 +381,7 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
 
     sequoiaRead(SEQUOIA_1GPIO,&seqReg);
@@ -407,7 +407,7 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
 
     sequoiaRead(SEQUOIA_2GPIO,&seqReg);
@@ -427,7 +427,7 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
 
     sequoiaRead(SEQUOIA_2GPIO,&seqReg);
@@ -561,10 +561,10 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
-    ledColor = color;    
-    
+    ledColor = color;
+
 
     sequoiaRead (PMC_FOMPCR_REG, &seqReg);
     switch(color)
@@ -622,7 +622,7 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
 
     /*
@@ -658,14 +658,14 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
     if(sequoia_index_cache != reg)
     {
         sequoia_index_cache = reg;
-        bus_space_write_2(&isa_io_bs_tag,sequoia_ioh,SEQUOIA_INDEX_OFFSET,reg);    
+        bus_space_write_2(&isa_io_bs_tag,sequoia_ioh,SEQUOIA_INDEX_OFFSET,reg);
     }
-    *seqReg_ptr = bus_space_read_2(&isa_io_bs_tag,sequoia_ioh,SEQUOIA_DATA_OFFSET);  
+    *seqReg_ptr = bus_space_read_2(&isa_io_bs_tag,sequoia_ioh,SEQUOIA_DATA_OFFSET);
 #ifdef SHARK
     restore_interrupts(savedints);
 #endif
@@ -678,7 +678,7 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
     sequoiaRead (PMC_FOMPCR_REG, &seqReg);
 
@@ -739,9 +739,9 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
-    reg = bus_space_read_2(&isa_io_bs_tag,sequoia_ioh,SEQUOIA_DATA_OFFSET);  
+    reg = bus_space_read_2(&isa_io_bs_tag,sequoia_ioh,SEQUOIA_DATA_OFFSET);
 #ifdef SHARK
     restore_interrupts(savedints);
 #endif
@@ -755,7 +755,7 @@
 #ifdef SHARK
     u_int savedints;
 
-    savedints = disable_interrupts(I32_bit | F32_bit);    
+    savedints = disable_interrupts(I32_bit | F32_bit);
 #endif
 
     sequoiaRead(SEQUOIA_2GPIO,&seqReg);
--- a/sys/arch/shark/shark/shark_machdep.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/shark_machdep.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: shark_machdep.c,v 1.41 2013/08/18 07:01:45 matt Exp $	*/
+/*	$NetBSD: shark_machdep.c,v 1.42 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright 1997
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.41 2013/08/18 07:01:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.42 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
@@ -398,7 +398,7 @@
 			*cp++ = '\0';
 			if (cp[0] == '\\')
 				cp++;
-			booted_kernel = cp; 
+			booted_kernel = cp;
 
 			/* Zap ".aout" suffix, arm32 libkvm now requires ELF */
 			cplen = strlen(cp);
--- a/sys/arch/shark/stand/ofwboot/boot.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/stand/ofwboot/boot.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,5 +1,5 @@
 #define	DEBUG
-/*	$NetBSD: boot.c,v 1.8 2016/06/11 06:41:55 dholland Exp $	*/
+/*	$NetBSD: boot.c,v 1.9 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -164,7 +164,7 @@
 	l += sizeof(magic);
 	DPRINTF("ssym @ %p\n", args + l);
 	memcpy(args + l, &ssym, sizeof(ssym));
-	l += sizeof(ssym); 
+	l += sizeof(ssym);
 	DPRINTF("esym @ %p\n", args + l);
 	memcpy(args + l, &esym, sizeof(esym));
 	l += sizeof(esym);
--- a/sys/arch/sparc/include/pci_machdep.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc/include/pci_machdep.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.h,v 1.11 2014/03/29 19:28:30 christos Exp $ */
+/*	$NetBSD: pci_machdep.h,v 1.12 2016/07/07 06:55:38 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1999 Matthew R. Green
@@ -38,7 +38,7 @@
  */
 typedef struct sparc_pci_chipset *pci_chipset_tag_t;
 typedef u_int pci_intr_handle_t;
-typedef uint64_t pcitag_t; 
+typedef uint64_t pcitag_t;
 
 
 /*
--- a/sys/arch/sparc64/dev/ffb.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/dev/ffb.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb.c,v 1.56 2015/09/11 22:27:17 macallan Exp $	*/
+/*	$NetBSD: ffb.c,v 1.57 2016/07/07 06:55:38 msaitoh Exp $	*/
 /*	$OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.56 2015/09/11 22:27:17 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.57 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -428,7 +428,7 @@
 		fba->emu_types[0] = sc->sc_fb.fb_type.fb_type;
 		fba->emu_types[1] = -1;
 #undef fba
-		break; 
+		break;
 
 	case FBIOGETCMAP:
 	case FBIOPUTCMAP:
@@ -466,7 +466,7 @@
 				sc->sc_mode = *(u_int *)data;
 				if ((sc->sc_mode == WSDISPLAYIO_MODE_EMUL) &&
 				    (sc->sc_locked == 0)) {
-					ffb_ras_init(sc);		
+					ffb_ras_init(sc);
 					vcons_redraw_screen(ms);
 				}
 			}
@@ -554,7 +554,7 @@
 		if (ms != NULL) {
 			if ((sc->sc_mode == WSDISPLAYIO_MODE_EMUL) && 
 			    (sc->sc_locked == 0)) {
-				ffb_ras_init(sc);		
+				ffb_ras_init(sc);
 				vcons_redraw_screen(ms);
 			}
 		}
@@ -885,7 +885,7 @@
 	if (ms != NULL) {
 		if ((sc->sc_mode == WSDISPLAYIO_MODE_EMUL) &&
 		    (sc->sc_locked == 0)) {
-			ffb_ras_init(sc);		
+			ffb_ras_init(sc);
 			vcons_redraw_screen(ms);
 		}
 	}
--- a/sys/arch/sparc64/dev/fhc.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/dev/fhc.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: fhc.c,v 1.4 2016/05/10 19:23:59 palle Exp $	*/
+/*	$NetBSD: fhc.c,v 1.5 2016/07/07 06:55:38 msaitoh Exp $	*/
 /*	$OpenBSD: fhc.c,v 1.17 2010/11/11 17:58:23 miod Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fhc.c,v 1.4 2016/05/10 19:23:59 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fhc.c,v 1.5 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -201,7 +201,7 @@
 
 		paddr = offset - sc->sc_range[i].coffset;
 		paddr += sc->sc_range[i].poffset;
-		paddr |= ((bus_addr_t)sc->sc_range[i].pspace << 32); 
+		paddr |= ((bus_addr_t)sc->sc_range[i].pspace << 32);
 
 		return bus_space_map(t->parent, paddr, size, flags, hp);
 	}
--- a/sys/arch/sparc64/dev/gfb.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/dev/gfb.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: gfb.c,v 1.7 2012/04/12 19:11:49 macallan Exp $	*/
+/*	$NetBSD: gfb.c,v 1.8 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.7 2012/04/12 19:11:49 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.8 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -245,7 +245,7 @@
 				printf(" %08x", bus_space_read_4(sc->sc_memt,
 				    regh, i + j));
 			}
-			printf("\n"); 
+			printf("\n");
 		}
 		bus_space_unmap(sc->sc_memt, regh, 0x2000);
 	}
--- a/sys/arch/sparc64/dev/psm.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/dev/psm.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: psm.c,v 1.10 2012/10/27 17:18:12 chs Exp $ */
+/* $NetBSD: psm.c,v 1.11 2016/07/07 06:55:38 msaitoh Exp $ */
 /*
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
  * time with APM at this point, and some of sysmon seems "lacking".
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.10 2012/10/27 17:18:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.11 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -333,7 +333,7 @@
     uint8_t addr)
 {
 	uint8_t	cmr = PSM_CMR_DATA(mode, PSM_L_16, PSM_D_RD, addr);
-	int	x, rc, retr = CMD_RETRIES; 
+	int	x, rc, retr = CMD_RETRIES;
 
 	x = splhigh();
 
@@ -367,7 +367,7 @@
     uint8_t addr)
 {
 	uint8_t	cmr = PSM_CMR_DATA(mode, PSM_L_8, PSM_D_RD, addr);
-	int	x, rc, retr = CMD_RETRIES; 
+	int	x, rc, retr = CMD_RETRIES;
 
 	x = splhigh();
 
--- a/sys/arch/sparc64/dev/sbus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/dev/sbus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbus.c,v 1.94 2016/05/10 19:23:59 palle Exp $ */
+/*	$NetBSD: sbus.c,v 1.95 2016/07/07 06:55:38 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1999-2002 Eduardo Horvath
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.94 2016/05/10 19:23:59 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.95 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opt_ddb.h"
 
@@ -178,7 +178,7 @@
 	sc->sc_dev = self;
 	sc->sc_bustag = ma->ma_bustag;
 	sc->sc_dmatag = ma->ma_dmatag;
-	sc->sc_ign = ma->ma_interrupts[0] & INTMAP_IGN;		
+	sc->sc_ign = ma->ma_interrupts[0] & INTMAP_IGN;
 
 	/* XXXX Use sysio PROM mappings for interrupt vector regs. */
 	sparc_promaddr_to_handle(sc->sc_bustag,	ma->ma_address[0], &sc->sc_bh);
@@ -505,7 +505,7 @@
 	struct sbus_softc *sc = t->cookie;
 	struct intrhand *ih;
 	int ipl;
-	long vec = pri; 
+	long vec = pri;
 
 	ih = intrhand_alloc();
 
--- a/sys/arch/sparc64/dev/tda.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/dev/tda.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: tda.c,v 1.10 2015/04/27 11:55:29 martin Exp $	*/
+/*	$NetBSD: tda.c,v 1.11 2016/07/07 06:55:38 msaitoh Exp $	*/
 /*	$OpenBSD: tda.c,v 1.4 2008/02/27 17:25:00 robert Exp $ */
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tda.c,v 1.10 2015/04/27 11:55:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tda.c,v 1.11 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -229,7 +229,7 @@
 	iic_release_bus(sc->sc_tag, 0);
 
 	aprint_debug_dev(sc->sc_dev, "changed fan speed to cpu=%d system=%d\n",
-		sc->sc_cfan_speed, sc->sc_sfan_speed); 
+		sc->sc_cfan_speed, sc->sc_sfan_speed);
 }
 
 static bool
--- a/sys/arch/sparc64/include/bus_defs.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/include/bus_defs.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_defs.h,v 1.2 2011/07/17 23:29:10 dyoung Exp $	*/
+/*	$NetBSD: bus_defs.h,v 1.3 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
 	PCI_IO_BUS_SPACE,
 	PCI_MEMORY_BUS_SPACE,
 	LAST_BUS_SPACE
-}; 
+};
 /* For backwards compatibility */
 #define SPARC_BUS_SPACE	UPA_BUS_SPACE
 
--- a/sys/arch/sparc64/include/pci_machdep.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/include/pci_machdep.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.27 2014/03/29 19:28:30 christos Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.28 2016/07/07 06:55:38 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1999 Matthew R. Green
@@ -54,7 +54,7 @@
 #define	PCITAG_FUN(t)		((PCITAG_OFFSET(t)>>8)&0x7)
 #define	PCITAG_CREATE(n,b,d,f)	(((uint64_t)(n)<<32)|((b)<<16)|((d)<<11)|((f)<<8))
 #define	PCITAG_SETNODE(t,n)	((t)&0xffffffff)|(((n)<<32)
-typedef uint64_t pcitag_t; 
+typedef uint64_t pcitag_t;
 
 typedef struct sparc_pci_chipset *pci_chipset_tag_t;
 typedef u_int pci_intr_handle_t;
--- a/sys/arch/sparc64/sparc64/cache.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/cache.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache.c,v 1.10 2015/01/05 11:40:56 palle Exp $	*/
+/*	$NetBSD: cache.c,v 1.11 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2011 Matthew R. Green
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.10 2015/01/05 11:40:56 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.11 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -135,7 +135,7 @@
 	if (CPU_ISSUN4V) {
 		sp_tlb_flush_pte = sp_tlb_flush_pte_sun4v;
 		sp_tlb_flush_all = sp_tlb_flush_all_sun4v;
-		cache_flush_phys = cache_flush_phys_sun4v; 
+		cache_flush_phys = cache_flush_phys_sun4v;
 	} else {
 		if (CPU_IS_USIII_UP() || CPU_IS_SPARC64_V_UP()) {
 			sp_tlb_flush_pte = sp_tlb_flush_pte_usiii;
--- a/sys/arch/sparc64/sparc64/clock.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/clock.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.119 2016/05/13 21:23:30 nakayama Exp $ */
+/*	$NetBSD: clock.c,v 1.120 2016/07/07 06:55:38 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.119 2016/05/13 21:23:30 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.120 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -592,11 +592,11 @@
 	if (intrdebug)
 		/* Neglect to enable timer */
 		stxa((vaddr_t)&timerreg_4u.t_timer[1].t_limit, ASI_NUCLEUS, 
-		     tmr_ustolim(statint)|TMR_LIM_RELOAD); 
+		     tmr_ustolim(statint)|TMR_LIM_RELOAD);
 	else
 #endif
 		stxa((vaddr_t)&timerreg_4u.t_timer[1].t_limit, ASI_NUCLEUS, 
-		     tmr_ustolim(statint)|TMR_LIM_IEN|TMR_LIM_RELOAD); 
+		     tmr_ustolim(statint)|TMR_LIM_IEN|TMR_LIM_RELOAD);
 	stxa((vaddr_t)&timerreg_4u.t_mapintr[1], ASI_NUCLEUS, 
 	     timerreg_4u.t_mapintr[1]|INTMAP_V|(CPU_UPAID << INTMAP_TID_SHIFT));
 
--- a/sys/arch/sparc64/sparc64/compat_16_machdep.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/compat_16_machdep.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_16_machdep.c,v 1.16 2016/03/11 18:31:03 christos Exp $ */
+/*	$NetBSD: compat_16_machdep.c,v 1.17 2016/07/07 06:55:38 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.16 2016/03/11 18:31:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.17 2016/07/07 06:55:38 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -87,7 +87,7 @@
 	struct lwp *l = curlwp;
 	struct proc *p = l->l_proc;
 	struct sigacts *ps = p->p_sigacts;
-	const void *addr; 
+	const void *addr;
 	struct rwindow *newsp;
 #ifdef NOT_DEBUG
 	struct rwindow tmpwin;
--- a/sys/arch/sparc64/sparc64/machdep.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/machdep.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.284 2016/05/13 21:22:47 nakayama Exp $ */
+/*	$NetBSD: machdep.c,v 1.285 2016/07/07 06:55:38 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.284 2016/05/13 21:22:47 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.285 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -280,7 +280,7 @@
 	tf->tf_tstate = tstate;
 	tf->tf_global[1] = l->l_proc->p_psstrp;
 	/* %g4 needs to point to the start of the data segment */
-	tf->tf_global[4] = 0; 
+	tf->tf_global[4] = 0;
 	tf->tf_pc = pack->ep_entry & ~3;
 	tf->tf_npc = tf->tf_pc + 4;
 	stack -= sizeof(struct rwindow);
@@ -459,7 +459,7 @@
 	memset(&uc.uc_stack, 0, sizeof(uc.uc_stack));
 
 	sendsig_reset(l, sig);
-	mutex_exit(p->p_lock);	
+	mutex_exit(p->p_lock);
 	cpu_getmcontext(l, &uc.uc_mcontext, &uc.uc_flags);
 	ucsz = (char *)&uc.__uc_pad - (char *)&uc;
 
--- a/sys/arch/sparc64/sparc64/ofw_machdep.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/ofw_machdep.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_machdep.c,v 1.45 2015/12/30 09:16:17 jdc Exp $	*/
+/*	$NetBSD: ofw_machdep.c,v 1.46 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.45 2015/12/30 09:16:17 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.46 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -126,7 +126,7 @@
 		cell_t nargs;
 		cell_t nreturns;
 		cell_t tba;
-		cell_t mmfsa; 
+		cell_t mmfsa;
 	} args;
 
 	args.name = ADR2CELL("SUNW,set-trap-table");
@@ -524,7 +524,7 @@
 	} else prom_printf("prom_get_msgbuf: test failed\n");
 	/* Allocate random memory -- page zero avail?*/
 	addr = prom_claim_phys(0x000, len);
-	prom_printf("prom_get_msgbuf: allocated new buf at %08x\n", (int)addr); 
+	prom_printf("prom_get_msgbuf: allocated new buf at %08x\n", (int)addr);
 	if (addr == -1) {
 		prom_printf("prom_get_msgbuf: cannot get allocate physmem\n");
 		return -1;
--- a/sys/arch/sparc64/sparc64/pmap.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/pmap.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.302 2016/04/17 14:32:03 martin Exp $	*/
+/*	$NetBSD: pmap.c,v 1.303 2016/07/07 06:55:38 msaitoh Exp $	*/
 /*
  *
  * Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.302 2016/04/17 14:32:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.303 2016/07/07 06:55:38 msaitoh Exp $");
 
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define	HWREF
@@ -191,7 +191,7 @@
 		if (p->pm_ctx[i] > 0)
 			return true;
 
-	return false;	
+	return false;
 }
 
 #ifdef MULTIPROCESSOR
@@ -1319,7 +1319,7 @@
 	 */
 	ci->ci_pmap_next_ctx = 1;
 	/* all SUN4U use 13 bit contexts - SUN4V use at least 13 bit contexts */
-	ci->ci_numctx = 0x2000; 
+	ci->ci_numctx = 0x2000;
 	ctxsize = sizeof(paddr_t)*ci->ci_numctx;
 	ci->ci_ctxbusy = (paddr_t *)kdata_alloc(ctxsize, sizeof(uint64_t));
 	memset(ci->ci_ctxbusy, 0, ctxsize);
--- a/sys/arch/sparc64/sparc64/sunos32_machdep.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/sunos32_machdep.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunos32_machdep.c,v 1.32 2011/03/04 22:25:29 joerg Exp $	*/
+/*	$NetBSD: sunos32_machdep.c,v 1.33 2016/07/07 06:55:38 msaitoh Exp $	*/
 /* from: NetBSD: sunos_machdep.c,v 1.14 2001/01/29 01:37:56 mrg Exp 	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_machdep.c,v 1.32 2011/03/04 22:25:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_machdep.c,v 1.33 2016/07/07 06:55:38 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -168,7 +168,7 @@
 	struct sunos32_sigframe sf;
 	struct sunos32_sigcontext *scp;
 	uint32_t addr, oldsp32;
-	int onstack, error; 
+	int onstack, error;
 	sig_t catcher = SIGACTION(p, sig).sa_handler;
 
 	tf = l->l_md.md_tf;
--- a/sys/arch/sparc64/sparc64/sunos_machdep.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/sunos_machdep.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunos_machdep.c,v 1.33 2015/11/22 09:32:34 martin Exp $	*/
+/*	$NetBSD: sunos_machdep.c,v 1.34 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1995 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.33 2015/11/22 09:32:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.34 2016/07/07 06:55:38 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -86,7 +86,7 @@
 	struct proc *p = l->l_proc;
 	register struct sunos_sigframe *fp;
 	register struct trapframe64 *tf;
-	register int addr, onstack; 
+	register int addr, onstack;
 	struct rwindow32 *oldsp, *newsp;
 	register32_t sp;
 	int sig = ksi->ksi_signo, error;
--- a/sys/arch/sparc64/sparc64/trap.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/trap.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.183 2016/05/13 21:21:43 palle Exp $ */
+/*	$NetBSD: trap.c,v 1.184 2016/07/07 06:55:38 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.183 2016/05/13 21:21:43 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.184 2016/07/07 06:55:38 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -104,11 +104,11 @@
 /* trapstats */
 int protfix = 0;
 int udmiss = 0;	/* Number of normal/nucleus data/text miss/protection faults */
-int udhit = 0;	
+int udhit = 0;
 int udprot = 0;
 int utmiss = 0;
 int kdmiss = 0;
-int kdhit = 0;	
+int kdhit = 0;
 int kdprot = 0;
 int ktmiss = 0;
 int iveccnt = 0; /* number if normal/nucleus interrupt/interrupt vector faults */
@@ -592,7 +592,7 @@
 				char sb[sizeof(PSTATE_BITS) + 64];
 
 				printf("trap type 0x%x: cpu %d, pc=%lx",
-				       type, cpu_number(), pc); 
+				       type, cpu_number(), pc);
 				snprintb(sb, sizeof(sb), PSTATE_BITS, pstate);
 				printf(" npc=%lx pstate=%s\n",
 				       (long)tf->tf_npc, sb);
@@ -1453,13 +1453,13 @@
 	if (((trapdebug & TDB_NSAVED) && curpcb->pcb_nsaved) || 
 	    (trapdebug & (TDB_TXTFLT | TDB_FOLLOW)))
 		printf("%d text_access_fault(%x, %lx, %p)\n",
-		       curproc?curproc->p_pid:-1, type, pc, tf); 
+		       curproc?curproc->p_pid:-1, type, pc, tf);
 	if (trapdebug & TDB_FRAME) {
 		print_trapframe(tf);
 	}
 	if ((trapdebug & TDB_TL) && gettl()) {
 		printf("%d tl %d text_access_fault(%x, %lx, %p)\n",
-		       curproc?curproc->p_pid:-1, gettl(), type, pc, tf); 
+		       curproc?curproc->p_pid:-1, gettl(), type, pc, tf);
 		Debugger();
 	}
 	if (trapdebug & TDB_STOPCALL) { 
@@ -1569,7 +1569,7 @@
 		printf("%ld text_access_error(%lx, %lx, %lx, %p)=%lx @ %lx %s\n",
 		       (long)(curproc?curproc->p_pid:-1), 
 		       (long)type, pc, (long)afva, tf, (long)tf->tf_tstate, 
-		       (long)tf->tf_pc, buf); 
+		       (long)tf->tf_pc, buf);
 	}
 	if (trapdebug & TDB_FRAME) {
 		print_trapframe(tf);
@@ -1579,7 +1579,7 @@
 		printf("%d tl %d text_access_error(%lx, %lx, %lx, %p)=%lx @ %lx %s\n",
 		       curproc?curproc->p_pid:-1, gettl(),
 		       (long)type, (long)pc, (long)afva, tf, 
-		       (long)tf->tf_tstate, (long)tf->tf_pc, buf); 
+		       (long)tf->tf_tstate, (long)tf->tf_pc, buf);
 		Debugger();
 	}
 	if (trapdebug & TDB_STOPCALL) { 
--- a/sys/arch/sun2/dev/zsvar.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sun2/dev/zsvar.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: zsvar.h,v 1.7 2008/03/29 19:15:35 tsutsui Exp $	*/
+/*	$NetBSD: zsvar.h,v 1.8 2016/07/07 06:55:38 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -69,7 +69,7 @@
 };
 
 /* MI function to attach a zs. */
-void zs_attach(struct zsc_softc *, struct zsdevice *, int); 
+void zs_attach(struct zsc_softc *, struct zsdevice *, int);
 
 /* MD function to get any console flags for a zs. */
 int zs_console_flags(int, int, int);
--- a/sys/arch/sun2/sun2/mbio.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sun2/sun2/mbio.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbio.c,v 1.18 2008/07/06 13:29:50 tsutsui Exp $	*/
+/*	$NetBSD: mbio.c,v 1.19 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.18 2008/07/06 13:29:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.19 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,7 +78,7 @@
 	NULL,				/* bus_intr_establish */
 	NULL,				/* bus_space_peek_N */
 	NULL				/* bus_space_poke_N */
-}; 
+};
 
 static int 
 mbio_match(device_t parent, cfdata_t cf, void *aux)
--- a/sys/arch/sun2/sun2/mbmem.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sun2/sun2/mbmem.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbmem.c,v 1.19 2008/07/06 13:29:50 tsutsui Exp $	*/
+/*	$NetBSD: mbmem.c,v 1.20 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mbmem.c,v 1.19 2008/07/06 13:29:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mbmem.c,v 1.20 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -84,7 +84,7 @@
 	NULL,				/* bus_intr_establish */
 	NULL,				/* bus_space_peek_N */
 	NULL				/* bus_space_poke_N */
-}; 
+};
 
 static struct sun68k_bus_dma_tag mbmem_dma_tag;
 
--- a/sys/arch/sun2/sun2/obio.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sun2/sun2/obio.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.18 2008/07/06 13:29:50 tsutsui Exp $	*/
+/*	$NetBSD: obio.c,v 1.19 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18 2008/07/06 13:29:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.19 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -84,7 +84,7 @@
 	NULL,				/* bus_intr_establish */
 	_obio_bus_peek,			/* bus_space_peek_N */
 	_obio_bus_poke			/* bus_space_poke_N */
-}; 
+};
 
 static int 
 obio_match(device_t parent, cfdata_t cf, void *aux)
--- a/sys/arch/sun2/sun2/obmem.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sun2/sun2/obmem.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: obmem.c,v 1.18 2012/10/13 06:28:54 tsutsui Exp $	*/
+/*	$NetBSD: obmem.c,v 1.19 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.18 2012/10/13 06:28:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.19 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,7 +74,7 @@
 	NULL,				/* bus_intr_establish */
 	NULL,				/* bus_space_peek_N */
 	NULL				/* bus_space_poke_N */
-}; 
+};
 
 static int 
 obmem_match(device_t parent, cfdata_t cf, void *aux)
--- a/sys/arch/sun2/sun2/tod.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sun2/sun2/tod.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: tod.c,v 1.14 2008/07/06 13:29:50 tsutsui Exp $	*/
+/*	$NetBSD: tod.c,v 1.15 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tod.c,v 1.14 2008/07/06 13:29:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tod.c,v 1.15 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -167,7 +167,7 @@
 {
 	struct vme_attach_args	*va = aux;
 	vme_chipset_tag_t	ct = va->va_vct;
-	vme_am_t		mod; 
+	vme_am_t		mod;
 	vme_addr_t		vme_addr;
 
 	/* Make sure there is something there... */
--- a/sys/arch/sun3/dev/if_ie.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sun3/dev/if_ie.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie.c,v 1.58 2016/06/10 13:27:13 ozaki-r Exp $ */
+/*	$NetBSD: if_ie.c,v 1.59 2016/07/07 06:55:39 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
@@ -98,7 +98,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.58 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.59 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -859,7 +859,7 @@
 			char *newdata = (char *)
 			    ALIGN(m->m_data + sizeof(struct ether_header)) -
 			    sizeof(struct ether_header);
-			len -= newdata - m->m_data; 
+			len -= newdata - m->m_data;
 			m->m_data = newdata;
 		}
 
--- a/sys/arch/sun68k/sun68k/bus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sun68k/sun68k/bus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.c,v 1.22 2014/09/21 16:40:10 christos Exp $	*/
+/*	$NetBSD: bus.c,v 1.23 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -153,7 +153,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.22 2014/09/21 16:40:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.23 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -626,7 +626,7 @@
 	if (vp == NULL)
 		vp = &junk;
 
-	nofault = &faultbuf; 
+	nofault = &faultbuf;
 	if (setjmp(&faultbuf))
 		result = -1;
 	else {
@@ -660,7 +660,7 @@
 	int result;
 	label_t	faultbuf;
 	
-	nofault = &faultbuf; 
+	nofault = &faultbuf;
 	if (setjmp(&faultbuf))
 		result = -1;
 	else {
--- a/sys/arch/usermode/usermode/pmap.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/usermode/usermode/pmap.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.105 2012/07/28 19:08:26 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.106 2016/07/07 06:55:39 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud@NetBSD.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.105 2012/07/28 19:08:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.106 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include "opt_memsize.h"
 #include "opt_kmempages.h"
@@ -335,8 +335,8 @@
 	fpos += pm_entries_size;
 
 	/* set up kernel pmap and add a l1 map */
-        pmap = pmap_kernel(); 
-        memset(pmap, 0, sizeof(*pmap)); 
+        pmap = pmap_kernel();
+        memset(pmap, 0, sizeof(*pmap));
 	pmap->pm_count = 1;		/* reference */
 	pmap->pm_flags = PM_ACTIVE;	/* kernel pmap is allways active */
 	pmap->pm_l1 = (struct pmap_l2 **) kmem_kvm_cur_start;
--- a/sys/arch/vax/boot/boot/consio.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/boot/boot/consio.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: consio.c,v 1.15 2009/03/14 14:46:07 dsl Exp $ */
+/*	$NetBSD: consio.c,v 1.16 2016/07/07 06:55:39 msaitoh Exp $ */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -62,7 +62,7 @@
 int rom_getc;		/* ROM-address of get-routine */
 
 /* Pointer to KA630 console page, initialized by ka630_consinit */
-unsigned char  *ka630_conspage; 
+unsigned char  *ka630_conspage;
 
 /* Function that initializes things for KA630 ROM console I/O */
 void ka630_consinit(void);
--- a/sys/arch/vax/mba/hp.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/mba/hp.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: hp.c,v 1.52 2014/12/31 20:37:52 christos Exp $ */
+/*	$NetBSD: hp.c,v 1.53 2016/07/07 06:55:39 msaitoh Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.52 2014/12/31 20:37:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.53 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -324,7 +324,7 @@
 	struct disklabel * const lp = sc->sc_disk.dk_label;
 	int	error;
 
-	error = disk_ioctl(&sc->sc_disk, dev, cmd, addr, flag, l); 
+	error = disk_ioctl(&sc->sc_disk, dev, cmd, addr, flag, l);
 	if (error != EPASSTHROUGH)
 		return error;
 
--- a/sys/arch/vax/uba/qv.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/uba/qv.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.31 2015/07/05 03:07:21 matt Exp $*/
+/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $*/
 /*
  * Copyright (c) 2015 Charles H. Dickman. All rights reserved.
  * Derived from smg.c
@@ -35,7 +35,7 @@
 /*3456789012345678901234567890123456789012345678901234567890123456789012345678*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.31 2015/07/05 03:07:21 matt Exp $");
+__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -103,7 +103,7 @@
 #define CUR_LO          15
 
 //static	uint16_t curcmd, curx, cury, hotX, hotY;
-static	int     bgmask, fgmask; 
+static	int     bgmask, fgmask;
 
 static	int     qv_match(device_t, cfdata_t, void *);
 static	void    qv_attach(device_t, device_t, void *);
@@ -236,7 +236,8 @@
 #if 0
 static int	genfb_match_qv(device_t, cfdata_t, void *);
 static void	genfb_attach_qv(device_t, device_t, void *);
-static int	genfb_ioctl_qv(void *, void *, u_long, void *, int, struct lwp*);
+static int	genfb_ioctl_qv(void *, void *, u_long, void *, int,
+    struct lwp*);
 static paddr_t	genfb_mmap_qv(void *, void *, off_t, int);
 static int      genfb_borrow_qv(void *, bus_addr_t, bus_space_handle_t *);
 
@@ -281,14 +282,14 @@
 static inline void
 qv_reg_wr(struct qv_softc *sc, uint16_t addr, uint16_t data)
 {
-        bus_space_write_2(sc->sc_iot, sc->sc_ioh, addr, data);       
+        bus_space_write_2(sc->sc_iot, sc->sc_ioh, addr, data);
 }
 
 /* controller register read helper function */
 static inline uint16_t
 qv_reg_rd(struct qv_softc *sc, uint16_t addr)
 {
-        return bus_space_read_2(sc->sc_iot, sc->sc_ioh, addr);       
+        return bus_space_read_2(sc->sc_iot, sc->sc_ioh, addr);
 }
 
 /*
@@ -298,7 +299,7 @@
 qv_crtc_wr(struct qv_softc *sc, uint16_t addr, uint16_t data)
 {
         qv_reg_wr(sc, QV_CRTC_AR, addr);
-        qv_reg_wr(sc, QV_CRTC_DR, data);        
+        qv_reg_wr(sc, QV_CRTC_DR, data);
 }
 
 /*
@@ -327,16 +328,16 @@
         
         if (!initted) {
 		/* init the interrupt controller */
-	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_RESET);  
+	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_RESET);
 		/* reset irr			 */
-	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_CLRIRR); 
+	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_CLRIRR);
 		/* specify individual vectors	 */
-	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_MODE);   
+	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_MODE);
 		/* preset autoclear data	 */
-	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_ACREG);  
+	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_ACREG);
 		/* all setup as autoclear	 */
-	        qv_ic_write(ua, QV_IC_DR + offs, 0xff);         
-        
+	        qv_ic_write(ua, QV_IC_DR + offs, 0xff);
+
 		/* clear all vector addresses */
                 for (i = 0; i < 8; i++)                         
                         qv_ic_setvec(ua, offs, i, 0);
@@ -346,23 +347,26 @@
 }
 
 void
-qv_ic_setvec(struct uba_attach_args *ua, bus_size_t offs, int ic_vec, int vecnum)
+qv_ic_setvec(struct uba_attach_args *ua, bus_size_t offs, int ic_vec,
+    int vecnum)
 {
 	/* preset vector address	*/
-	qv_ic_write(ua, QV_IC_SR + offs, QV_IC_RMEM | RMEM_BC_1 | ic_vec);      
+	qv_ic_write(ua, QV_IC_SR + offs, QV_IC_RMEM | RMEM_BC_1 | ic_vec);
+
 	/* give it the vector number	*/
-	qv_ic_write(ua, QV_IC_DR + offs, vecnum);	                        
+	qv_ic_write(ua, QV_IC_DR + offs, vecnum);
 }
 
 void
-qv_ic_enable(struct uba_attach_args *ua, bus_size_t offs, int ic_vec, int enable)
+qv_ic_enable(struct uba_attach_args *ua, bus_size_t offs, int ic_vec,
+    int enable)
 {
         if (enable)
 		/* enable the interrupt */        
-	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_CIMR | ic_vec);          
+	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_CIMR | ic_vec);
         else
-		/* disable the interrupt */        
-	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_SIMR | ic_vec);          
+		/* disable the interrupt */
+	        qv_ic_write(ua, QV_IC_SR + offs, QV_IC_SIMR | ic_vec);
 }
 
 void
@@ -370,17 +374,17 @@
 {
         if (arm) 
 		/* arm the interrupt ctrl	*/
-                qv_ic_write(ua, QV_IC_SR + offs, QV_IC_ARM);	                
+                qv_ic_write(ua, QV_IC_SR + offs, QV_IC_ARM);
         else
 		/* disarm the interrupt ctrl	*/
-                qv_ic_write(ua, QV_IC_SR + offs, QV_IC_DISARM);	                
+                qv_ic_write(ua, QV_IC_SR + offs, QV_IC_DISARM);
 }
 
 void
 qv_ic_force(struct uba_attach_args *ua, bus_size_t offs, int ic_vec)
 {
 	/* force an interrupt	*/
-	qv_ic_write(ua, QV_IC_SR + offs, QV_IC_SIRR | ic_vec);	                
+	qv_ic_write(ua, QV_IC_SR + offs, QV_IC_SIRR | ic_vec);
 }
 
 /*
@@ -527,7 +531,7 @@
                 c -= 32;
         
         /* return pointer line in font glyph */        
-        return &sc->sc_font[c*QV_CHEIGHT + line];        
+        return &sc->sc_font[c*QV_CHEIGHT + line];
 }
 
 /*
@@ -705,10 +709,10 @@
 	    		    qv_fbp(ss->ss_sc, dstrow + n, 0, 0), QV_NEXTROW);
 	else if (ol < 0) {
 	 	for (n = 0; n < nrows; n++) {
-			dp = &ss->ss_sc->sc_scanmap[(dstrow + n)*QV_CHEIGHT];  
+			dp = &ss->ss_sc->sc_scanmap[(dstrow + n)*QV_CHEIGHT];
 			sp = &ss->ss_sc->sc_scanmap[(srcrow + n)*QV_CHEIGHT];
 			for (line = 0; line < QV_CHEIGHT; line++) {
-				tmp = *dp; 
+				tmp = *dp;
 				*dp = *sp;
 				*sp = tmp;
 				dp++;
@@ -720,10 +724,10 @@
 	}
 	else {
 	 	for (n = nrows - 1; n >= 0; n--) {
-			dp = &ss->ss_sc->sc_scanmap[(dstrow + n)*QV_CHEIGHT];  
+			dp = &ss->ss_sc->sc_scanmap[(dstrow + n)*QV_CHEIGHT];
 			sp = &ss->ss_sc->sc_scanmap[(srcrow + n)*QV_CHEIGHT];
 			for (line = 0; line < QV_CHEIGHT; line++) {
-				tmp = *dp; 
+				tmp = *dp;
 				*dp = *sp;
 				*sp = tmp;
 				dp++;
@@ -856,7 +860,7 @@
                 qv_crtc_wr(sc, CUR_HI, sc->sc_cury >> 4);
                 qv_reg_wr(sc, QV_CUR_X, sc->sc_curx);
                 qv_crtc_wr(sc, CUR_START, 
-                    sc->sc_curon | (sc->sc_cury & 0x0f));		
+                    sc->sc_curon | (sc->sc_cury & 0x0f));
 		break;
 
 	case WSDISPLAYIO_GCURPOS:
--- a/sys/arch/vax/uba/qvaux.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/uba/qvaux.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: qvaux.c,v 1.1 2015/07/05 03:07:21 matt Exp $	*/
+/*	$NetBSD: qvaux.c,v 1.2 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -261,38 +261,38 @@
 #endif
 
 	/* set floating DUART vector and enable interrupts */
-        qv_ic_setvec(ua, QVA_QVIC, QV_DUART_VEC, ua->ua_cvec); 
+        qv_ic_setvec(ua, QVA_QVIC, QV_DUART_VEC, ua->ua_cvec);
         qv_ic_arm(ua, QVA_QVIC, QV_IC_ENA);
 	bus_space_write_2(ua->ua_iot, ua->ua_ioh, QVA_QVCSR,
-	    bus_space_read_2(ua->ua_iot, ua->ua_ioh, QVA_QVCSR) | (1 << 6));  
+	    bus_space_read_2(ua->ua_iot, ua->ua_ioh, QVA_QVCSR) | (1 << 6));
 
 	sc->sc_dev = self;
 	sc->sc_iot = ua->ua_iot;
 	sc->sc_ioh = ua->ua_ioh;
 
         /* device register access structure */
-        sc->sc_qr.qr_ipcr = DU_IPCR;        
-        sc->sc_qr.qr_acr = DU_ACR;        
-        sc->sc_qr.qr_isr = DU_ISR;        
-        sc->sc_qr. qr_imr = DU_IMR;        
-        sc->sc_qr.qr_ctur = DU_CTUR;        
-        sc->sc_qr.qr_ctlr = DU_CTLR;        
-        sc->sc_qr.qr_ip = DU_IP;        
-        sc->sc_qr.qr_opcr = DU_OPCR;        
-        sc->sc_qr.qr_cstrt = DU_IMR;        
-        sc->sc_qr.qr_opset = DU_OPSET;        
-        sc->sc_qr.qr_cstop = DU_CSTOP;        
-        sc->sc_qr.qr_opclr = DU_OPCLR;        
+        sc->sc_qr.qr_ipcr = DU_IPCR;
+        sc->sc_qr.qr_acr = DU_ACR;
+        sc->sc_qr.qr_isr = DU_ISR;
+        sc->sc_qr. qr_imr = DU_IMR;
+        sc->sc_qr.qr_ctur = DU_CTUR;
+        sc->sc_qr.qr_ctlr = DU_CTLR;
+        sc->sc_qr.qr_ip = DU_IP;
+        sc->sc_qr.qr_opcr = DU_OPCR;
+        sc->sc_qr.qr_cstrt = DU_IMR;
+        sc->sc_qr.qr_opset = DU_OPSET;
+        sc->sc_qr.qr_cstop = DU_CSTOP;
+        sc->sc_qr.qr_opclr = DU_OPCLR;
         sc->sc_qr.qr_ch_regs[0].qr_mr = CH_MR(0);
-        sc->sc_qr.qr_ch_regs[0].qr_sr = CH_SR(0);        
-        sc->sc_qr.qr_ch_regs[0].qr_csr = CH_CSR(0);        
-        sc->sc_qr.qr_ch_regs[0].qr_cr = CH_CR(0);        
-        sc->sc_qr.qr_ch_regs[0].qr_dat = CH_DAT(0);                
+        sc->sc_qr.qr_ch_regs[0].qr_sr = CH_SR(0);
+        sc->sc_qr.qr_ch_regs[0].qr_csr = CH_CSR(0);
+        sc->sc_qr.qr_ch_regs[0].qr_cr = CH_CR(0);
+        sc->sc_qr.qr_ch_regs[0].qr_dat = CH_DAT(0);
         sc->sc_qr.qr_ch_regs[1].qr_mr = CH_MR(1);
-        sc->sc_qr.qr_ch_regs[1].qr_sr = CH_SR(1);        
-        sc->sc_qr.qr_ch_regs[1].qr_csr = CH_CSR(1);        
-        sc->sc_qr.qr_ch_regs[1].qr_cr = CH_CR(1);        
-        sc->sc_qr.qr_ch_regs[1].qr_dat = CH_DAT(1);                
+        sc->sc_qr.qr_ch_regs[1].qr_sr = CH_SR(1);
+        sc->sc_qr.qr_ch_regs[1].qr_csr = CH_CSR(1);
+        sc->sc_qr.qr_ch_regs[1].qr_cr = CH_CR(1);
+        sc->sc_qr.qr_ch_regs[1].qr_dat = CH_DAT(1);
 
 	sc->sc_qr.qr_firstreg = QVA_FIRSTREG;
 	sc->sc_qr.qr_winsize = QVA_WINSIZE;
--- a/sys/arch/vax/vax/cfl.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/cfl.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cfl.c,v 1.22 2014/07/25 08:10:35 dholland Exp $	*/
+/*	$NetBSD: cfl.c,v 1.23 2016/07/07 06:55:39 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfl.c,v 1.22 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfl.c,v 1.23 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -202,7 +202,7 @@
 			bp->b_flags &= ~(B_WRITE);
 			bp->b_flags |= B_READ;
 		}
-		s = splconsmedia(); 
+		s = splconsmedia();
 		cflstart();
 		biowait(bp);
 		splx(s);
--- a/sys/arch/vax/vax/compat_13_machdep.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/compat_13_machdep.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.4 2011/07/03 02:18:21 matt Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.5 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.4 2011/07/03 02:18:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.5 2016/07/07 06:55:39 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -171,8 +171,8 @@
 	sigctx.sc_pc = tf->tf_pc;
 	sigctx.sc_ps = tf->tf_psl;
 	sigctx.sc_ap = tf->tf_ap;
-	sigctx.sc_fp = tf->tf_fp; 
-	sigctx.sc_sp = tf->tf_sp; 
+	sigctx.sc_fp = tf->tf_fp;
+	sigctx.sc_sp = tf->tf_sp;
 	sigctx.sc_onstack = onstack ? SS_ONSTACK : 0;
 	sigctx.sc_mask = *mask;
 	sp -= sizeof(struct sigcontext);
--- a/sys/arch/vax/vax/crl.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/crl.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: crl.c,v 1.32 2014/07/25 08:10:35 dholland Exp $	*/
+/*	$NetBSD: crl.c,v 1.33 2016/07/07 06:55:39 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crl.c,v 1.32 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crl.c,v 1.33 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -161,7 +161,7 @@
 			bp->b_flags &= ~(B_WRITE);
 			bp->b_flags |= B_READ;
 		}
-		s = splconsmedia(); 
+		s = splconsmedia();
 		crlstart();
                 while ((bp->b_oflags & BO_DONE) == 0)
                   (void) tsleep(bp, PRIBIO, "crlxfer", 0);
--- a/sys/arch/vax/vax/ctu.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/ctu.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ctu.c,v 1.34 2014/07/25 08:10:35 dholland Exp $ */
+/*	$NetBSD: ctu.c,v 1.35 2016/07/07 06:55:39 msaitoh Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.34 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.35 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -382,7 +382,7 @@
 #ifdef TUDEBUG
 		printf("Writing byte %d\n", tu_sc.sc_xbytes);
 #endif
-		WAIT; mtpr(RSP_TYP_DATA, PR_CSTD); 
+		WAIT; mtpr(RSP_TYP_DATA, PR_CSTD);
 		WAIT; mtpr(128, PR_CSTD);
 		for (i = 0; i < 128; i++) {
 			WAIT;
--- a/sys/arch/vax/vax/gencons.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/gencons.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: gencons.c,v 1.54 2014/07/25 08:10:35 dholland Exp $	*/
+/*	$NetBSD: gencons.c,v 1.55 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -36,7 +36,7 @@
  /* All bugs are subject to removal without further notice */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gencons.c,v 1.54 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gencons.c,v 1.55 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_cputype.h"
@@ -313,7 +313,7 @@
 	}
 #if 0
 	mtpr(0, PR_RXCS);
-	mtpr(0, PR_TXCS); 
+	mtpr(0, PR_TXCS);
 	mtpr(0, PR_TBIA); /* ??? */
 #endif
 }
@@ -371,7 +371,7 @@
 {
 	if (pollflag)  {
 		mtpr(0, PR_RXCS);
-		mtpr(0, PR_TXCS); 
+		mtpr(0, PR_TXCS);
 	} else {
 		mtpr(GC_RIE, PR_RXCS);
 		mtpr(GC_TIE, PR_TXCS);
--- a/sys/arch/vax/vax/ka750.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/ka750.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka750.c,v 1.45 2013/03/26 20:52:29 martin Exp $ */
+/*	$NetBSD: ka750.c,v 1.46 2016/07/07 06:55:39 msaitoh Exp $ */
 /*
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * All rights reserved.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka750.c,v 1.45 2013/03/26 20:52:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka750.c,v 1.46 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -270,7 +270,7 @@
 	int mcsr = mfpr(PR_MCSR);
 
 	printf("machine check %x: %s%s\n", type, mc750[type&0xf],
-	    (type&0xf0) ? " abort" : " fault"); 
+	    (type&0xf0) ? " abort" : " fault");
 	printf(
 "\tva %x errpc %x mdr %x smr %x rdtimo %x tbgpar %x cacherr %x\n",
 	    mcf->mc5_va, mcf->mc5_errpc, mcf->mc5_mdr, mcf->mc5_svmode,
--- a/sys/arch/vax/vax/ka780.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/ka780.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ka780.c,v 1.31 2014/03/24 20:06:33 christos Exp $ */
+/*	$NetBSD: ka780.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $ */
 /*-
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.31 2014/03/24 20:06:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -328,7 +328,7 @@
 	int sbifs;
 
 	printf("machine check %x: %s%s\n", type, mc780[type&0xf],
-	    (type&0xf0) ? " abort" : " fault"); 
+	    (type&0xf0) ? " abort" : " fault");
 	printf("\tcpues %x upc %x va/viba %x dreg %x tber %x %x\n",
 	   mcf->mc8_cpues, mcf->mc8_upc, mcf->mc8_vaviba,
 	   mcf->mc8_dreg, mcf->mc8_tber0, mcf->mc8_tber1);
--- a/sys/arch/vax/vax/sgmap.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/sgmap.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap.c,v 1.18 2015/07/05 02:03:36 matt Exp $ */
+/* $NetBSD: sgmap.c,v 1.19 2016/07/07 06:55:39 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgmap.c,v 1.18 2015/07/05 02:03:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgmap.c,v 1.19 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -165,7 +165,7 @@
 int
 vax_sgmap_reserve(bus_addr_t ba, bus_size_t len, struct vax_sgmap *sgmap)
 {
-	return extent_alloc_region(sgmap->aps_ex, ba, len, EX_NOWAIT); 
+	return extent_alloc_region(sgmap->aps_ex, ba, len, EX_NOWAIT);
 }
 
 int
--- a/sys/arch/vax/vax/trap.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vax/trap.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.133 2015/03/03 13:23:48 martin Exp $     */
+/*	$NetBSD: trap.c,v 1.134 2016/07/07 06:55:39 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -33,7 +33,7 @@
  /* All bugs are subject to removal without further notice */
 		
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.133 2015/03/03 13:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.134 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -111,7 +111,7 @@
 	if (usermode) {
 		type |= T_USER;
 		oticks = p->p_sticks;
-		l->l_md.md_utf = tf; 
+		l->l_md.md_utf = tf;
 		LWP_CACHE_CREDS(l, p);
 	}
 
--- a/sys/arch/vax/vsa/asc_vsbus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vsa/asc_vsbus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: asc_vsbus.c,v 1.43 2012/10/27 17:18:13 chs Exp $	*/
+/*	$NetBSD: asc_vsbus.c,v 1.44 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.43 2012/10/27 17:18:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.44 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include "locators.h"
 #include "opt_cputype.h"
@@ -352,7 +352,7 @@
 
 	if (asc->sc_dmasize == 0) {
 		/* A "Transfer Pad" operation completed */
-		tcl = NCR_READ_REG(sc, NCR_TCL); 
+		tcl = NCR_READ_REG(sc, NCR_TCL);
 		tcm = NCR_READ_REG(sc, NCR_TCM);
 		NCR_DMA(("asc_vsbus_intr: discarded %d bytes (tcl=%d, tcm=%d)\n",
 		    tcl | (tcm << 8), tcl, tcm));
--- a/sys/arch/vax/vsa/smg.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vsa/smg.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: smg.c,v 1.55 2012/01/11 21:26:13 macallan Exp $ */
+/*	$NetBSD: smg.c,v 1.56 2016/07/07 06:55:39 msaitoh Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.55 2012/01/11 21:26:13 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.56 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -106,7 +106,7 @@
 #define	WRITECUR(addr, val)	*(volatile uint16_t *)(curaddr + (addr)) = (val)
 static	char *curaddr;
 static	uint16_t curcmd, curx, cury, hotX, hotY;
-static	int bgmask, fgmask; 
+static	int bgmask, fgmask;
 
 static	int smg_match(device_t, cfdata_t, void *);
 static	void smg_attach(device_t, device_t, void *);
--- a/sys/arch/vax/vsa/spx.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vsa/spx.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: spx.c,v 1.8 2014/03/28 13:26:24 ozaki-r Exp $ */
+/*	$NetBSD: spx.c,v 1.9 2016/07/07 06:55:39 msaitoh Exp $ */
 /*
  * SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
  * Copyright (c) 2005 Blaz Antonic
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.8 2014/03/28 13:26:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.9 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -622,7 +622,7 @@
 #endif
 
 	sc->sc_mask = 0x04; /* XXX - should be generated */
-	scb_fake(0x14c, 0x15);	
+	scb_fake(0x14c, 0x15);
 
 	return 20;
 }
@@ -748,7 +748,7 @@
 	SPX_REG(SPX_FG) = COLOR(dot_fg);
 	SPX_REG(SPX_BG) = COLOR(dot_bg);
 	SPX_REG(SPX_MAIN3) = 0x01010101;
-	SPX_REG(SPX_COMMAND) = 0x84884648; 
+	SPX_REG(SPX_COMMAND) = 0x84884648;
 	SPX_REG(SPX_XSTART) = (col * spx_font.fontwidth) << 16;
 	SPX_REG(SPX_YSTART) = (row * spx_font.fontheight) << 16;
 	SPX_REG(SPX_XEND) = ((col + 1) * spx_font.fontwidth) << 16;
--- a/sys/arch/vax/vsa/vsbus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/vax/vsa/vsbus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsbus.c,v 1.61 2015/05/31 07:04:18 abs Exp $ */
+/*	$NetBSD: vsbus.c,v 1.62 2016/07/07 06:55:39 msaitoh Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.61 2015/05/31 07:04:18 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.62 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include "opt_cputype.h"
 
@@ -94,7 +94,7 @@
 
 	aprint_normal(" csr 0x%lx vec %o ipl %x maskbit %d", va->va_paddr,
 	    va->va_cvec & 511, va->va_br, va->va_maskno - 1);
-	return UNCONF; 
+	return UNCONF;
 }
 
 int
@@ -374,7 +374,7 @@
 {	
 	struct vsbus_dma *vd;
 	
-	vd = SIMPLEQ_FIRST(&vsbus_dma); 
+	vd = SIMPLEQ_FIRST(&vsbus_dma);
 	if (vd == NULL) {
 		vsbus_active = 0;
 		return;
--- a/sys/arch/x68k/dev/bmd.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/x68k/dev/bmd.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bmd.c,v 1.24 2015/04/26 15:15:19 mlelstv Exp $	*/
+/*	$NetBSD: bmd.c,v 1.25 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2002 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.24 2015/04/26 15:15:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.25 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -356,7 +356,7 @@
 	if (sc == NULL)
 		return ENXIO;
 
-	error = disk_ioctl(&sc->sc_dkdev, dev, cmd, data, flag, l); 
+	error = disk_ioctl(&sc->sc_dkdev, dev, cmd, data, flag, l);
 	if (error != EPASSTHROUGH)
 		return error;
 
--- a/sys/arch/x86/include/intr.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/x86/include/intr.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.48 2015/08/17 06:16:02 knakahara Exp $	*/
+/*	$NetBSD: intr.h,v 1.49 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 struct intrstub {
 	void *ist_entry;
-	void *ist_recurse; 
+	void *ist_recurse;
 	void *ist_resume;
 };
 
--- a/sys/arch/x86/pci/pci_ranges.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/x86/pci/pci_ranges.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_ranges.c,v 1.5 2015/07/27 15:45:20 msaitoh Exp $	*/
+/*	$NetBSD: pci_ranges.c,v 1.6 2016/07/07 06:55:39 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_ranges.c,v 1.5 2015/07/27 15:45:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_ranges.c,v 1.6 2016/07/07 06:55:39 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -895,11 +895,11 @@
 	aprint_verbose("%s: inferred %" PRIuMAX
 	    " bytes of memory-mapped PCI space at 0x%" PRIxMAX "\n", __func__,
 	    (uintmax_t)(ric.ric_mmio_top - ric.ric_mmio_bottom),
-	    (uintmax_t)ric.ric_mmio_bottom); 
+	    (uintmax_t)ric.ric_mmio_bottom);
 	aprint_verbose("%s: inferred %" PRIuMAX
 	    " bytes of PCI I/O space at 0x%" PRIxMAX "\n", __func__,
 	    (uintmax_t)(ric.ric_io_top - ric.ric_io_bottom),
-	    (uintmax_t)ric.ric_io_bottom); 
+	    (uintmax_t)ric.ric_io_bottom);
 	TAILQ_FOREACH(pal, &ric.ric_pals, pal_link)
 		pci_alloc_print(pc, pal);
 
--- a/sys/arch/x86/x86/coretemp.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/x86/x86/coretemp.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.34 2015/05/27 00:16:46 msaitoh Exp $ */
+/* $NetBSD: coretemp.c,v 1.35 2016/07/07 06:55:40 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.34 2015/05/27 00:16:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.35 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -138,7 +138,7 @@
 	 * Only attach on the first SMT ID.
 	 */
 	if (ci->ci_smt_id != 0)
-		return 0 ;
+		return 0;
 
 	/*
 	 * CPUID 0x06 returns 1 if the processor
--- a/sys/arch/x86/x86/cpu.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/x86/x86/cpu.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.119 2015/12/16 18:54:03 maxv Exp $	*/
+/*	$NetBSD: cpu.c,v 1.120 2016/07/07 06:55:40 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.119 2015/12/16 18:54:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.120 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
@@ -138,7 +138,7 @@
 };
 
 #ifdef MULTIPROCESSOR
-int mp_cpu_start(struct cpu_info *, paddr_t); 
+int mp_cpu_start(struct cpu_info *, paddr_t);
 void mp_cpu_start_cleanup(struct cpu_info *);
 const struct cpu_functions mp_cpu_funcs = { mp_cpu_start, NULL,
 					    mp_cpu_start_cleanup };
--- a/sys/arch/x86/x86/ipmi.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/x86/x86/ipmi.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipmi.c,v 1.63 2016/04/03 10:32:00 mlelstv Exp $ */
+/*	$NetBSD: ipmi.c,v 1.64 2016/07/07 06:55:40 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.63 2016/04/03 10:32:00 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.64 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1330,7 +1330,7 @@
 	0x0000000024924925ll /* 1.0/7.0 */,
 	0x0000000020000000ll /* -1.0/8.0 */,
 	0x000000001c71c71cll /* 1.0/9.0 */
-}; 
+};
 
 static int64_t fixexp_a[] = {
 	0x0000000100000000ll /* 1.0/1.0 */,
@@ -1342,13 +1342,13 @@
 	0x00000000005b05b0ll /* 1.0/720.0 */,
 	0x00000000000d00d0ll /* 1.0/5040.0 */,
 	0x000000000001a01all /* 1.0/40320.0 */
-};      
+};
 
 static int64_t
 fixmul(int64_t x, int64_t y)
 {
 	int64_t z;
-	int64_t a,b,c,d; 
+	int64_t a,b,c,d;
 	int neg;
 
 	neg = 0;
@@ -1388,7 +1388,7 @@
 static int64_t
 logx(int64_t x, int64_t y)
 {
-	int64_t z; 
+	int64_t z;
 
 	if (x <= INT2FIX(0)) {
 		z = INT2FIX(-99999);
--- a/sys/arch/x86/x86/mpacpi.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/x86/x86/mpacpi.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpacpi.c,v 1.101 2015/07/17 06:41:18 msaitoh Exp $	*/
+/*	$NetBSD: mpacpi.c,v 1.102 2016/07/07 06:55:40 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.101 2015/07/17 06:41:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.102 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include "acpica.h"
 #include "opt_acpi.h"
@@ -495,8 +495,8 @@
 
 	rv = acpi_get(ad->ad_handle, &buf, AcpiGetIrqRoutingTable);
 	if (ACPI_FAILURE(rv)) {
-		buf.Length = 0; 
-		buf.Pointer = NULL; 
+		buf.Length = 0;
+		buf.Pointer = NULL;
 	}
 
 	mpr = kmem_zalloc(sizeof(struct mpacpi_pcibus), KM_SLEEP);
--- a/sys/arch/x86/x86/syscall.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/x86/x86/syscall.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.13 2014/10/26 15:38:28 christos Exp $	*/
+/*	$NetBSD: syscall.c,v 1.14 2016/07/07 06:55:40 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.13 2014/10/26 15:38:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.14 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,7 +73,7 @@
 		mutex_enter(proc_lock);
                 KSI_INIT_EMPTY(&ksi);
                 ksi.ksi_signo = SIGTRAP;
-                ksi.ksi_lid = l->l_lid; 
+                ksi.ksi_lid = l->l_lid;
                 kpsignal(p, &ksi, NULL);
 		mutex_exit(proc_lock);
 	}
--- a/sys/arch/xen/include/intr.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/include/intr.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.36 2015/04/27 07:03:58 knakahara Exp $	*/
+/*	$NetBSD: intr.h,v 1.37 2016/07/07 06:55:40 msaitoh Exp $	*/
 /*	NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp	*/
 
 /*-
@@ -68,7 +68,7 @@
 #if 0
 	void *ist_entry;
 #endif
-	void *ist_recurse; 
+	void *ist_recurse;
 	void *ist_resume;
 };
 
--- a/sys/arch/xen/include/xen-public/arch-x86/xen-mca.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/include/xen-public/arch-x86/xen-mca.h	Thu Jul 07 06:55:38 2016 +0000
@@ -255,8 +255,8 @@
 #define MC_CAPS_AMD_ECX	6	/* cpuid level 0x80000001 (%ecx) */
 
 struct mcinfo_logical_cpu {
-    uint32_t mc_cpunr;          
-    uint32_t mc_chipid; 
+    uint32_t mc_cpunr;
+    uint32_t mc_chipid;
     uint16_t mc_coreid;
     uint16_t mc_threadid;
     uint32_t mc_apicid;
--- a/sys/arch/xen/include/xen-public/domctl.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/include/xen-public/domctl.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: domctl.h,v 1.1.1.2 2011/12/07 14:41:16 cegger Exp $ */
+/* $NetBSD: domctl.h,v 1.2 2016/07/07 06:55:40 msaitoh Exp $ */
 /******************************************************************************
  * domctl.h
  * 
@@ -783,7 +783,7 @@
         struct mem_sharing_op_share {     /* OP_SHARE */
             uint64_aligned_t source_handle; /* IN: handle to the source page */
             uint64_aligned_t client_handle; /* IN: handle to the client page */
-        } share; 
+        } share;
         struct mem_sharing_op_debug {     /* OP_DEBUG_xxx */
             union {
                 uint64_aligned_t gfn;      /* IN: gfn to debug          */
--- a/sys/arch/xen/include/xen-public/io/blkif.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/include/xen-public/io/blkif.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: blkif.h,v 1.6 2011/12/07 15:04:18 cegger Exp $ */
+/* $NetBSD: blkif.h,v 1.7 2016/07/07 06:55:40 msaitoh Exp $ */
 /******************************************************************************
  * blkif.h
  * 
@@ -125,7 +125,7 @@
 struct blkif_x86_32_response {
     uint64_t        id;              /* copied from request */
     uint8_t         operation;       /* copied from request */
-    uint8_t         _pad; 
+    uint8_t         _pad;
     int16_t         status;          /* BLKIF_RSP_???       */
 } __packed;
 typedef struct blkif_x86_32_response blkif_x86_32_response_t;
--- a/sys/arch/xen/include/xen-public/physdev.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/include/xen-public/physdev.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: physdev.h,v 1.6 2011/12/07 15:04:18 cegger Exp $ */
+/* $NetBSD: physdev.h,v 1.7 2016/07/07 06:55:40 msaitoh Exp $ */
 /*
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -181,7 +181,7 @@
     /* IN */
     uint8_t bus;
     uint8_t devfn;
-}; 
+};
 
 typedef struct physdev_manage_pci physdev_manage_pci_t;
 DEFINE_XEN_GUEST_HANDLE(physdev_manage_pci_t);
--- a/sys/arch/xen/include/xen-public/sysctl.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/include/xen-public/sysctl.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.h,v 1.1.1.2 2011/12/07 14:41:15 cegger Exp $ */
+/* $NetBSD: sysctl.h,v 1.2 2016/07/07 06:55:40 msaitoh Exp $ */
 /******************************************************************************
  * sysctl.h
  * 
@@ -51,7 +51,7 @@
      * IN:  Start index for consuming from ring buffer (if @incremental);
      * OUT: End index after consuming from ring buffer.
      */
-    uint32_t index; 
+    uint32_t index;
     /* IN: Virtual address to write console data. */
     XEN_GUEST_HANDLE_64(char) buffer;
     /* IN: Size of buffer; OUT: Bytes written to buffer. */
@@ -177,16 +177,16 @@
     uint64_aligned_t idletime;
 };
 typedef struct xen_sysctl_cpuinfo xen_sysctl_cpuinfo_t;
-DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpuinfo_t); 
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpuinfo_t);
 struct xen_sysctl_getcpuinfo {
     /* IN variables. */
     uint32_t max_cpus;
     XEN_GUEST_HANDLE_64(xen_sysctl_cpuinfo_t) info;
     /* OUT variables. */
     uint32_t nr_cpus;
-}; 
+};
 typedef struct xen_sysctl_getcpuinfo xen_sysctl_getcpuinfo_t;
-DEFINE_XEN_GUEST_HANDLE(xen_sysctl_getcpuinfo_t); 
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_getcpuinfo_t);
 
 /* XEN_SYSCTL_availheap */
 struct xen_sysctl_availheap {
--- a/sys/arch/xen/include/xen.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/include/xen.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: xen.h,v 1.36 2016/05/29 17:06:17 bouyer Exp $	*/
+/*	$NetBSD: xen.h,v 1.37 2016/07/07 06:55:40 msaitoh Exp $	*/
 
 /*
  *
@@ -234,9 +234,9 @@
 static __inline void
 xen_atomic_setbits_l (volatile XATOMIC_T *ptr, unsigned long bits) {  
 #ifdef __x86_64__
-	__asm volatile("lock ; orq %1,%0" :  "=m" (*ptr) : "ir" (bits)); 
+	__asm volatile("lock ; orq %1,%0" :  "=m" (*ptr) : "ir" (bits));
 #else
-	__asm volatile("lock ; orl %1,%0" :  "=m" (*ptr) : "ir" (bits)); 
+	__asm volatile("lock ; orl %1,%0" :  "=m" (*ptr) : "ir" (bits));
 #endif
 }
      
--- a/sys/arch/xen/include/xenio.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/include/xenio.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: xenio.h,v 1.10 2015/09/07 03:49:46 dholland Exp $	*/
+/*	$NetBSD: xenio.h,v 1.11 2016/07/07 06:55:40 msaitoh Exp $	*/
 
 /******************************************************************************
  * privcmd.h
@@ -46,20 +46,20 @@
     unsigned long va;
     unsigned long mfn;
     unsigned long npages;
-} privcmd_mmap_entry_t; 
+} privcmd_mmap_entry_t;
 
 typedef struct privcmd_mmap {
     int num;
     domid_t dom; /* target domain */
     privcmd_mmap_entry_t *entry;
-} privcmd_mmap_t; 
+} privcmd_mmap_t;
 
 typedef struct privcmd_mmapbatch {
     int num;     /* number of pages to populate */
     domid_t dom; /* target domain */
     unsigned long addr;  /* virtual address */
     unsigned long *arr; /* array of mfns - top nibble set on err */
-} privcmd_mmapbatch_t; 
+} privcmd_mmapbatch_t;
 
 typedef struct privcmd_mmapbatch_v2 {
     int num;     /* number of pages to populate */
@@ -67,7 +67,7 @@
     uint64_t addr;  /* virtual address */
     const xen_pfn_t *arr; /* array of mfns */
     int *err; /* array of error codes */
-} privcmd_mmapbatch_v2_t; 
+} privcmd_mmapbatch_v2_t;
 
 typedef struct privcmd_blkmsg
 {
--- a/sys/arch/xen/x86/cpu.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/x86/cpu.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.103 2015/12/13 16:11:14 christos Exp $	*/
+/*	$NetBSD: cpu.c,v 1.104 2016/07/07 06:55:40 msaitoh Exp $	*/
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.103 2015/12/13 16:11:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.104 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -762,7 +762,7 @@
 static void
 gdt_prepframes(paddr_t *frames, vaddr_t base, uint32_t entries)
 {
-	int i;	
+	int i;
 	for (i = 0; i < roundup(entries, PAGE_SIZE) >> PAGE_SHIFT; i++) {
 
 		frames[i] = ((paddr_t) xpmap_ptetomach(
@@ -800,7 +800,7 @@
 
 	memset(initctx, 0, sizeof *initctx);
 
-	gdt_ents = roundup(gdt_size, PAGE_SIZE) >> PAGE_SHIFT; 
+	gdt_ents = roundup(gdt_size, PAGE_SIZE) >> PAGE_SHIFT;
 	KASSERT(gdt_ents <= 16);
 
 	gdt_prepframes(frames, (vaddr_t) ci->ci_gdt, gdt_ents);
--- a/sys/arch/xen/x86/xen_ipi.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/x86/xen_ipi.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.19 2015/02/07 20:01:48 joerg Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -33,10 +33,10 @@
 
 /* 
  * Based on: x86/ipi.c
- * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.19 2015/02/07 20:01:48 joerg Exp $"); 
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $");
  */
 
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.19 2015/02/07 20:01:48 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include <sys/types.h>
 
--- a/sys/arch/xen/xen/balloon.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/xen/balloon.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: balloon.c,v 1.16 2012/06/30 23:36:20 jym Exp $ */
+/* $NetBSD: balloon.c,v 1.17 2016/07/07 06:55:40 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
 #define BALLOONDEBUG 0
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: balloon.c,v 1.16 2012/06/30 23:36:20 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: balloon.c,v 1.17 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include <sys/inttypes.h>
 #include <sys/device.h>
@@ -438,7 +438,7 @@
 static size_t
 balloon_deflate(struct balloon_xenbus_softc *sc, size_t tpages)
 {
-	int rpages, s, ret; 
+	int rpages, s, ret;
 	paddr_t pa;
 	struct balloon_page_entry *bpg_entry;
 	xen_pfn_t *mfn_list = sc->sc_mfn_list;
--- a/sys/arch/xen/xen/pciback.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/xen/pciback.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: pciback.c,v 1.10 2016/01/06 15:28:40 bouyer Exp $      */
+/*      $NetBSD: pciback.c,v 1.11 2016/07/07 06:55:40 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2009 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciback.c,v 1.10 2016/01/06 15:28:40 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciback.c,v 1.11 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include "opt_xen.h"
 
@@ -519,7 +519,7 @@
 pciback_xenbus_destroy(void *arg)
 {
 	struct pb_xenbus_instance *pbxi = arg;
-	struct pciback_pci_dev *pbd; 
+	struct pciback_pci_dev *pbd;
 	struct gnttab_unmap_grant_ref op;
 	int err;
 
--- a/sys/arch/xen/xen/xen_debug.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/xen/xen_debug.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: xen_debug.c,v 1.8 2011/07/17 20:54:49 joerg Exp $	*/
+/*	$NetBSD: xen_debug.c,v 1.9 2016/07/07 06:55:40 msaitoh Exp $	*/
 
 /*
  *
@@ -51,7 +51,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_debug.c,v 1.8 2011/07/17 20:54:49 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_debug.c,v 1.9 2016/07/07 06:55:40 msaitoh Exp $");
 
 #define XENDEBUG
 
@@ -123,9 +123,9 @@
 	printk("  nr_pages:   %lu",   si->nr_pages);
 	printk("  shared_inf: %p (was %p)\n",  HYPERVISOR_shared_info,
 	    si->shared_info);
-	printk("  pt_base:    %p",    (void *)si->pt_base); 
+	printk("  pt_base:    %p",    (void *)si->pt_base);
 	printk("  mod_start:  0x%lx\n", si->mod_start);
-	printk("  mod_len:    %lu\n", si->mod_len); 
+	printk("  mod_len:    %lu\n", si->mod_len);
 #if 0
 	printk("  net_rings: ");
 	for (i = 0; i < MAX_DOMAIN_VIFS; i++) {
@@ -433,6 +433,6 @@
 trap_init(void)
 {
 
-	HYPERVISOR_set_trap_table(trap_table);    
+	HYPERVISOR_set_trap_table(trap_table);
 }
 #endif
--- a/sys/arch/xen/xen/xenevt.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/xen/xenevt.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xenevt.c,v 1.44 2015/08/20 14:40:17 christos Exp $      */
+/*      $NetBSD: xenevt.c,v 1.45 2016/07/07 06:55:40 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.44 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.45 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include "opt_xen.h"
 #include <sys/param.h>
@@ -118,7 +118,7 @@
 	kcondvar_t cv;
 	STAILQ_ENTRY(xenevt_d) pendingq;
 	bool pending;
-	evtchn_port_t ring[2048]; 
+	evtchn_port_t ring[2048];
 	u_int ring_read; /* pointer of the reader */
 	u_int ring_write; /* pointer of the writer */
 	u_int flags;
--- a/sys/arch/xen/xenbus/xenbus_comms.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/xenbus/xenbus_comms.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_comms.c,v 1.14 2011/09/20 00:12:24 jym Exp $ */
+/* $NetBSD: xenbus_comms.c,v 1.15 2016/07/07 06:55:40 msaitoh Exp $ */
 /******************************************************************************
  * xenbus_comms.c
  *
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_comms.c,v 1.14 2011/09/20 00:12:24 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_comms.c,v 1.15 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/null.h> 
@@ -53,7 +53,7 @@
 
 struct xenstore_domain_interface *xenstore_interface;
 
-extern int xenstored_ready; 
+extern int xenstored_ready;
 // static DECLARE_WORK(probe_work, xenbus_probe, NULL);
 
 static int wake_waiting(void *);
@@ -74,7 +74,7 @@
 wake_waiting(void *arg)
 {
 	if (__predict_false(xenstored_ready == 0 && xendomain_is_dom0())) {
-		xenstored_ready = 1; 
+		xenstored_ready = 1;
 		wakeup(&xenstored_ready);
 	} 
 
--- a/sys/arch/xen/xenbus/xenbus_dev.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/xenbus/xenbus_dev.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_dev.c,v 1.9 2011/09/22 23:02:35 jym Exp $ */
+/* $NetBSD: xenbus_dev.c,v 1.10 2016/07/07 06:55:40 msaitoh Exp $ */
 /*
  * xenbus_dev.c
  * 
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_dev.c,v 1.9 2011/09/22 23:02:35 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_dev.c,v 1.10 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include "opt_xen.h"
 
@@ -266,7 +266,7 @@
 		int a_mode;
 		struct ucred *a_cred;
 	} */ *ap = v;
-	struct kernfs_node *kfs = VTOKERN(ap->a_vp);    
+	struct kernfs_node *kfs = VTOKERN(ap->a_vp);
 
 	struct xenbus_dev_data *u;
 
@@ -293,7 +293,7 @@
 		int a_fflag;
 		struct ucred *a_cred;
 	} */ *ap = v;
-	struct kernfs_node *kfs = VTOKERN(ap->a_vp);    
+	struct kernfs_node *kfs = VTOKERN(ap->a_vp);
 
 	struct xenbus_dev_data *u = kfs->kfs_v;
 	struct xenbus_dev_transaction *trans;
@@ -324,7 +324,7 @@
 	} */ *ap = v;
 	struct uio *uio = ap->a_uio;
 	int off, error;
-	size_t len; 
+	size_t len;
 	char strbuf[LD_STRLEN], *bf;
 
 	off = (int)uio->uio_offset;
--- a/sys/arch/xen/xenbus/xenbus_probe.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/xen/xenbus/xenbus_probe.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.38 2013/10/13 06:55:34 riz Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.39 2016/07/07 06:55:40 msaitoh Exp $ */
 /******************************************************************************
  * Talks to Xen Store to figure out what devices we have.
  *
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.38 2013/10/13 06:55:34 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.39 2016/07/07 06:55:40 msaitoh Exp $");
 
 #if 0
 #define DPRINTK(fmt, args...) \
@@ -606,7 +606,7 @@
 static struct xenbus_watch be_watch;
 
 /* A flag to determine if xenstored is 'ready' (i.e. has started) */
-int xenstored_ready = 0; 
+int xenstored_ready = 0;
 
 void
 xenbus_probe(void *unused)
@@ -616,7 +616,7 @@
 		.xa_type = "balloon"
 	};
 
-	KASSERT((xenstored_ready > 0)); 
+	KASSERT((xenstored_ready > 0));
 
 	/* Enumerate devices in xenstore. */
 	xenbus_probe_frontends();
@@ -674,7 +674,7 @@
 		/* Next allocate a local port which xenstored can bind to */
 		op.cmd = EVTCHNOP_alloc_unbound;
 		op.u.alloc_unbound.dom        = DOMID_SELF;
-		op.u.alloc_unbound.remote_dom = 0; 
+		op.u.alloc_unbound.remote_dom = 0;
 
 		err = HYPERVISOR_event_channel_op(&op);
 		if (err) {
@@ -698,10 +698,10 @@
 	xb_init_comms(xenbus_dev);
 
 	/* Initialize the interface to xenstore. */
-	err = xs_init(xenbus_dev); 
+	err = xs_init(xenbus_dev);
 	if (err) {
 		aprint_error_dev(xenbus_dev,
-				"Error initializing xenstore comms: %i\n", err);
+		    "Error initializing xenstore comms: %i\n", err);
 		goto err0;
 	}
 
--- a/sys/arch/zaurus/dev/zaudiovar.h	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/zaurus/dev/zaudiovar.h	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: zaudiovar.h,v 1.1 2014/09/23 14:49:46 nonaka Exp $	*/
+/*	$NetBSD: zaudiovar.h,v 1.2 2016/07/07 06:55:40 msaitoh Exp $	*/
 /*	$OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $	*/
 
 /*
@@ -71,7 +71,7 @@
 	int			sc_jack;
 	int			sc_state;
 	int			sc_icount;
-	callout_t		sc_to; 
+	callout_t		sc_to;
 };
 
 #define UNMUTE(sc,op,val) sc->sc_unmute[op] = sc->sc_unmute_toggle[op] = val
--- a/sys/arch/zaurus/zaurus/machdep.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/zaurus/zaurus/machdep.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.36 2016/05/31 04:14:12 dholland Exp $	*/
+/*	$NetBSD: machdep.c,v 1.37 2016/07/07 06:55:40 msaitoh Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.36 2016/05/31 04:14:12 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2016/07/07 06:55:40 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -862,13 +862,13 @@
 
 #ifdef VERBOSE_INIT_ARM
 	printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa,
-	    irqstack.pv_va); 
+	    irqstack.pv_va);
 	printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa,
-	    abtstack.pv_va); 
+	    abtstack.pv_va);
 	printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa,
-	    undstack.pv_va); 
+	    undstack.pv_va);
 	printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa,
-	    kernelstack.pv_va); 
+	    kernelstack.pv_va);
 	printf("minidataclean: p0x%08lx v0x%08lx, size = %ld\n",
 	    minidataclean.pv_pa, minidataclean.pv_va,
 	    xscale_minidata_clean_size);
--- a/sys/coda/coda_psdev.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/coda/coda_psdev.c	Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: coda_psdev.c,v 1.56 2015/08/20 14:40:17 christos Exp $	*/
+/*	$NetBSD: coda_psdev.c,v 1.57 2016/07/07 06:55:40 msaitoh Exp $	*/
 
 /*
  *
@@ -54,7 +54,7 @@
 /* These routines are the device entry points for Venus. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.56 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.57 2016/07/07 06:55:40 msaitoh Exp $");
 
 extern int coda_nc_initialized;    /* Set if cache has been initialized */
 
@@ -395,7 +395,7 @@
 {
     ENTRY;
 
-    switch(cmd) {
+    switch (cmd) {
     case CODARESIZE: {
 	struct coda_resize *data = (struct coda_resize *)addr;
 	return(coda_nc_resize(data->hashsize, data->heapsize, IS_DOWNCALL));
--- a/sys/dev/acpi/sony_acpi.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/acpi/sony_acpi.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 
 	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
--- a/sys/dev/bluetooth/btmagic.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/bluetooth/btmagic.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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_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 = {
--- a/sys/dev/cardbus/if_ex_cardbus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/cardbus/if_ex_cardbus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 					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;
 	}
--- a/sys/dev/cardbus/if_fxp_cardbus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/cardbus/if_fxp_cardbus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 #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 @@
 }
 
 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;
--- a/sys/dev/cardbus/if_rtw_cardbus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/cardbus/if_rtw_cardbus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 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 *);
 
--- a/sys/dev/cardbus/ohci_cardbus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/cardbus/ohci_cardbus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 };
 
 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)
--- a/sys/dev/cardbus/uhci_cardbus.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/cardbus/uhci_cardbus.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 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)
--- a/sys/dev/cgd.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/cgd.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 	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,
--- a/sys/dev/ic/adw.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/ic/adw.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	 */
 	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);
 	}
 
--- a/sys/dev/ic/aic6915.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/ic/aic6915.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 	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 @@
 	    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 @@
 		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 @@
 		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 @@
 	    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 @@
 		    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 @@
 			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 @@
 			/* 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 @@
 		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 @@
 		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 @@
 	    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 */
 	}
 
--- a/sys/dev/ic/cac.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/ic/cac.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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);
--- a/sys/dev/ic/dpt.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/ic/dpt.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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++) {
--- a/sys/dev/ic/mlx.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/ic/mlx.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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 @@
 
 	/* 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 @@
 		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 @@
 					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 @@
 					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 @@
 			    (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 @@
 			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 @@
 	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 @@
 		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 @@
 		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);
 	}
--- a/sys/dev/ic/opl.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/ic/opl.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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;
--- a/sys/dev/ic/smc91cxx.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/ic/smc91cxx.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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);
--- a/sys/dev/isa/adv_isa.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/isa/adv_isa.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	}
 
 	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;
 	}
 
--- a/sys/dev/midi.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/midi.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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
--- a/sys/dev/mii/acphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/acphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	 * 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)
--- a/sys/dev/mii/bmtphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/bmtphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	 * 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");
--- a/sys/dev/mii/ciphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/ciphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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, "");
--- a/sys/dev/mii/dmphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/dmphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/exphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/exphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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 {
--- a/sys/dev/mii/glxtphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/glxtphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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);
 
--- a/sys/dev/mii/gphyter.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/gphyter.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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);
 
--- a/sys/dev/mii/icsphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/icsphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/igphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/igphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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, "");
--- a/sys/dev/mii/ihphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/ihphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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, "");
--- a/sys/dev/mii/ikphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/ikphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
  */
 
 #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 @@
 
 	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, "");
--- a/sys/dev/mii/inphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/inphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/iophy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/iophy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/lxtphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/lxtphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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) {
--- a/sys/dev/mii/makphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/makphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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);
 
--- a/sys/dev/mii/micphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/micphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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, "");
--- a/sys/dev/mii/nsphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/nsphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/nsphyter.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/nsphyter.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/pnaphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/pnaphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/qsphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/qsphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/rlphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/rlphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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");
--- a/sys/dev/mii/sqphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/sqphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 
 	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");
--- a/sys/dev/mii/tqphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/tqphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/mii/ukphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/ukphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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, "");
--- a/sys/dev/mii/urlphy.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/mii/urlphy.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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);
--- a/sys/dev/pad/pad.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pad/pad.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 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 @@
 			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) {
--- a/sys/dev/pci/aac_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/aac_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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;
--- a/sys/dev/pci/amr.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/amr.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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 @@
 		}
 
 		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 @@
 	} 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 @@
 			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 @@
 		    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 @@
 	 * 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_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 @@
 		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 @@
 				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);
 	}
--- a/sys/dev/pci/auich.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/auich.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	/* 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 @@
 			}
 		}
 		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;
 	}
 
--- a/sys/dev/pci/auixp.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/auixp.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	/* 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;
 	}
 
--- a/sys/dev/pci/autri.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/autri.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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;
 	}
 
--- a/sys/dev/pci/bktr/bktr_os.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/bktr/bktr_os.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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__ */
 
--- a/sys/dev/pci/cmpci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/cmpci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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_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)
--- a/sys/dev/pci/cs4280.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/cs4280.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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_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 *);
--- a/sys/dev/pci/cs4281.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/cs4281.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 				     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 */
--- a/sys/dev/pci/cy_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/cy_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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;
 	}
 
--- a/sys/dev/pci/cz.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/cz.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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");
 	}
 
 	/*
--- a/sys/dev/pci/eap.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/eap.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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;
--- a/sys/dev/pci/emuxki.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/emuxki.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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) {
--- a/sys/dev/pci/esm.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/esm.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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 @@
 	/* 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;
--- a/sys/dev/pci/eso.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/eso.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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");
--- a/sys/dev/pci/fwohci_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/fwohci_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
     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 @@
 	 */
 	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 @@
 
 	/* 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;
 	}
--- a/sys/dev/pci/genfb_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/genfb_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		    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;
--- a/sys/dev/pci/hdaudio_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/hdaudio_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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,
--- a/sys/dev/pci/ichsmb.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/ichsmb.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	} 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) {
--- a/sys/dev/pci/if_bwi_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_bwi_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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;
 	}
--- a/sys/dev/pci/if_dge.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_dge.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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;
         }
 
--- a/sys/dev/pci/if_esh_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_esh_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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;
--- a/sys/dev/pci/if_mtd_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_mtd_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 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 @@
 		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;
--- a/sys/dev/pci/if_sf_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_sf_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	/* 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 @@
 	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;
--- a/sys/dev/pci/if_sip.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_sip.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 	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);
 	}
--- a/sys/dev/pci/if_ste.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_ste.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	/* 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 @@
 	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 @@
 		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 @@
 	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 @@
 	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 @@
 				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 @@
 			    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 @@
 	}
 
 	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);
 }
--- a/sys/dev/pci/if_stge.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_stge.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	/* 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 @@
 	    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 @@
 	    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;
 	}
 
--- a/sys/dev/pci/if_ti.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_ti.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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 @@
 	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 @@
 	    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;
 	}
 
--- a/sys/dev/pci/if_tl.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_tl.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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 @@
 	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);
--- a/sys/dev/pci/if_tlp_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_tlp_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	/* 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;
 	}
 
--- a/sys/dev/pci/if_vr.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/if_vr.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	    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 @@
 	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 @@
 	    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;
 	}
 
--- a/sys/dev/pci/isp_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/isp_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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->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 @@
 			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 @@
 		}
 		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);
--- a/sys/dev/pci/ld_virtio.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/ld_virtio.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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;
 	}
 
--- a/sys/dev/pci/mly.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/mly.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	}
 
 	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 @@
 	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:
--- a/sys/dev/pci/mpt_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/mpt_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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;
 	}
 
--- a/sys/dev/pci/pccbb.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/pccbb.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	    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 @@
 	 */
 	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 @@
 		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_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 @@
 #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 */
--- a/sys/dev/pci/pciide_common.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/pciide_common.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 }
 
 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 @@
 }
 
 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 @@
 }
 
 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 @@
 }
 
 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 @@
 
 /* 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 @@
  * 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 @@
 }
 
 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);
--- a/sys/dev/pci/puc.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/puc.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		    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;
--- a/sys/dev/pci/rtsx_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/rtsx_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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;
--- a/sys/dev/pci/trm.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/trm.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	}
 	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;
 		}
--- a/sys/dev/pci/twa.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/twa.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 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 @@
 	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 @@
 	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 @@
 		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 @@
 		 * 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 @@
 				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 @@
 	} 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 @@
 	}
 
 	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 @@
 				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 @@
 				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 @@
 			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 @@
 
 			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 @@
 		}
 		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 @@
 	}
 	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 @@
 		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 @@
 				&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 @@
 
 	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 @@
 	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_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 @@
 
 		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 @@
 			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_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;
 		}
 	}
--- a/sys/dev/pci/twe.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/twe.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	}
 
 	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.
--- a/sys/dev/pci/ubsec.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/ubsec.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 /*
  * 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 @@
 		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 @@
 #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 @@
 			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 @@
 		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 @@
 		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 @@
 	/* 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 @@
 		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 @@
 
 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 @@
 
 #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 @@
 #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 @@
 			}
 			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 @@
 					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 @@
 		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 @@
 		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 @@
 #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 @@
 		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 @@
 #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 @@
 		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 @@
 		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);
--- a/sys/dev/pci/vga_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/vga_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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_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
 
 	/*
--- a/sys/dev/pci/viomb.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/viomb.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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 @@
 		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 @@
 		       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 @@
 		       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;
--- a/sys/dev/pci/virtio.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/virtio.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 }
 
 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 @@
 	/* 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 @@
  * 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 @@
  * 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;
--- a/sys/dev/pci/weasel_pci.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pci/weasel_pci.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 	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 @@
 				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 @@
 	 */
 	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 @@
 	 */
 	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 @@
 	 */
 	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 @@
 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));
 }
--- a/sys/dev/pcmcia/esp_pcmcia.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pcmcia/esp_pcmcia.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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;
 	}
 
--- a/sys/dev/pcmcia/if_cs_pcmcia.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pcmcia/if_cs_pcmcia.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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;
 	}
 
--- a/sys/dev/pcmcia/if_ep_pcmcia.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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");
 
--- a/sys/dev/pcmcia/if_mbe_pcmcia.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pcmcia/if_mbe_pcmcia.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 {
 	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 @@
 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 @@
 
 	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;
 	}
 
--- a/sys/dev/pcmcia/if_ray.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pcmcia/if_ray.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	/*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 @@
 	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_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 @@
 {
 	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 @@
 			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 @@
 		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 @@
 		 * 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 @@
 #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_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 @@
 		/* 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 @@
 	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 @@
 		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 @@
 		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 @@
 		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 @@
 	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 @@
 
 	/* 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 @@
 	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 @@
 	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_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 @@
 	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 @@
 	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 @@
 		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 @@
 	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 @@
 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 @@
 {
 	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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 {
 	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 @@
  * 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 @@
 			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);
--- a/sys/dev/pcmcia/if_sm_pcmcia.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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 @@
 	} 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. */
--- a/sys/dev/pcmcia/if_wi_pcmcia.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 #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 @@
 
 	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;
 	}
 
--- a/sys/dev/usb/if_aue.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/if_aue.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		    "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;
--- a/sys/dev/usb/if_kue.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/if_kue.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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;
 }
--- a/sys/dev/usb/if_rum.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/if_rum.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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");
--- a/sys/dev/usb/if_udav.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/if_udav.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 
 /* 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 @@
 
 	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 @@
 
 	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 @@
 
 	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 @@
 		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);
--- a/sys/dev/usb/if_upl.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/if_upl.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	{ 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 @@
 	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 @@
 	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;
 }
--- a/sys/dev/usb/if_ural.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/if_ural.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	{ 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 @@
 
 	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 @@
 
 	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;
 }
--- a/sys/dev/usb/if_url.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/if_url.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 
 /* 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 @@
 	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;
 }
--- a/sys/dev/usb/if_zyd.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/if_zyd.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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;
 }
--- a/sys/dev/usb/moscom.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/moscom.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 	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;
 }
--- a/sys/dev/usb/pseye.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/pseye.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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 @@
 	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;
 }
--- a/sys/dev/usb/slurm.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/slurm.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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);
 }
--- a/sys/dev/usb/stuirda.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/stuirda.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 #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 @@
 }
 
 int
-stuirda_fwload(struct uirda_softc *sc) {
+stuirda_fwload(struct uirda_softc *sc)
+{
 
 
 	int rc;
--- a/sys/dev/usb/uark.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uark.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 		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;
 }
--- a/sys/dev/usb/uaudio.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uaudio.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		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 @@
 	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,
--- a/sys/dev/usb/ubsa.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/ubsa.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 			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);
 }
--- a/sys/dev/usb/ubt.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/ubt.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
  *
  */
 
-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 @@
 	/* 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 @@
 
 	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");
 
--- a/sys/dev/usb/uchcom.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uchcom.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 	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;
 }
--- a/sys/dev/usb/ucycom.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/ucycom.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 };
 #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 @@
 		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;
--- a/sys/dev/usb/udsbr.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/udsbr.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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 @@
 	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;
 }
--- a/sys/dev/usb/udsir.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/udsir.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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;
--- a/sys/dev/usb/uftdi.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uftdi.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 		    &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 @@
 			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;
 }
--- a/sys/dev/usb/ugen.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/ugen.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 #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 @@
 		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 @@
 	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++) {
--- a/sys/dev/usb/ugensa.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/ugensa.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 	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;
 }
--- a/sys/dev/usb/uhid.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uhid.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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_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 @@
 	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 @@
 
 #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);
--- a/sys/dev/usb/uhidev.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uhidev.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	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 @@
 		}
 	}
 
-	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);
--- a/sys/dev/usb/uhso.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uhso.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 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 @@
 #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 @@
 	}
 
 	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 @@
 	    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 @@
 	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 @@
 
 	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 @@
 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 @@
 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 @@
 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 @@
 		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 @@
 				}
 
 				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 @@
 }
 
 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;
 
--- a/sys/dev/usb/uipaq.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uipaq.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 	/* 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 @@
 		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 @@
 	/* 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 @@
 
 	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 @@
 	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 @@
 	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;
 }
--- a/sys/dev/usb/uirda.c	Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/dev/usb/uirda.c	Thu Jul 07 06:55:38 2016 +0000
@@ -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 @@
 
 	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 @@
 	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);