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

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

details:   https://anonhg.NetBSD.org/src/rev/91a60c356bf8
branches:  nick-nhusb
changeset: 804761:91a60c356bf8
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Jan 29 10:16:09 2017 +0000

description:
KNF

diffstat:

 sys/dev/usb/umass.c        |  10 +++++-----
 sys/dev/usb/umass_isdata.c |  14 +++++++-------
 sys/dev/usb/umass_scsipi.c |  12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diffs (117 lines):

diff -r c1b37a02c584 -r 91a60c356bf8 sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c       Sun Jan 29 10:13:51 2017 +0000
+++ b/sys/dev/usb/umass.c       Sun Jan 29 10:16:09 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass.c,v 1.149.2.18 2017/01/29 10:10:30 skrll Exp $   */
+/*     $NetBSD: umass.c,v 1.149.2.19 2017/01/29 10:16:09 skrll Exp $   */
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149.2.18 2017/01/29 10:10:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149.2.19 2017/01/29 10:16:09 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -135,12 +135,12 @@
 #include "wd.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/buf.h>
 #include <sys/conf.h>
-#include <sys/buf.h>
 #include <sys/device.h>
+#include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/systm.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
diff -r c1b37a02c584 -r 91a60c356bf8 sys/dev/usb/umass_isdata.c
--- a/sys/dev/usb/umass_isdata.c        Sun Jan 29 10:13:51 2017 +0000
+++ b/sys/dev/usb/umass_isdata.c        Sun Jan 29 10:16:09 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_isdata.c,v 1.30.2.7 2017/01/29 10:10:30 skrll Exp $      */
+/*     $NetBSD: umass_isdata.c,v 1.30.2.8 2017/01/29 10:16:09 skrll Exp $      */
 
 /*
  * TODO:
@@ -37,21 +37,21 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.30.2.7 2017/01/29 10:10:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.30.2.8 2017/01/29 10:16:09 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/buf.h>
 #include <sys/conf.h>
-#include <sys/buf.h>
 #include <sys/device.h>
+#include <sys/disklabel.h>
+#include <sys/kernel.h>
+#include <sys/kmem.h>
 #include <sys/proc.h>
-#include <sys/disklabel.h>
-#include <sys/kmem.h>
+#include <sys/systm.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
diff -r c1b37a02c584 -r 91a60c356bf8 sys/dev/usb/umass_scsipi.c
--- a/sys/dev/usb/umass_scsipi.c        Sun Jan 29 10:13:51 2017 +0000
+++ b/sys/dev/usb/umass_scsipi.c        Sun Jan 29 10:16:09 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_scsipi.c,v 1.49.2.8 2017/01/29 10:13:51 skrll Exp $      */
+/*     $NetBSD: umass_scsipi.c,v 1.49.2.9 2017/01/29 10:16:09 skrll Exp $      */
 
 /*
  * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49.2.8 2017/01/29 10:13:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49.2.9 2017/01/29 10:16:09 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -41,15 +41,16 @@
 #include "scsibus.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
+#include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/disk.h>          /* XXX */
 #include <sys/ioctl.h>
+#include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <sys/malloc.h>
+#include <sys/systm.h>
 
 /* SCSI & ATAPI */
 #include <sys/scsiio.h>
@@ -64,7 +65,6 @@
 #include <dev/scsipi/scsi_disk.h>
 #include <dev/scsipi/scsi_changer.h>
 
-#include <sys/disk.h>          /* XXX */
 #include <dev/scsipi/sdvar.h>  /* XXX */
 
 /* USB */