Module Name: src
Committed By: skrll
Date: Sun Jan 29 10:16:09 UTC 2017
Modified Files:
src/sys/dev/usb [nick-nhusb]: umass.c umass_isdata.c umass_scsipi.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.149.2.18 -r1.149.2.19 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.30.2.7 -r1.30.2.8 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.49.2.8 -r1.49.2.9 src/sys/dev/usb/umass_scsipi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.149.2.18 src/sys/dev/usb/umass.c:1.149.2.19
--- src/sys/dev/usb/umass.c:1.149.2.18 Sun Jan 29 10:10:30 2017
+++ src/sys/dev/usb/umass.c Sun Jan 29 10:16:09 2017
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.
#include "wd.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
#include <sys/buf.h>
+#include <sys/conf.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>
Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.30.2.7 src/sys/dev/usb/umass_isdata.c:1.30.2.8
--- src/sys/dev/usb/umass_isdata.c:1.30.2.7 Sun Jan 29 10:10:30 2017
+++ src/sys/dev/usb/umass_isdata.c Sun Jan 29 10:16:09 2017
@@ -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/conf.h>
#include <sys/buf.h>
+#include <sys/conf.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/disklabel.h>
+#include <sys/kernel.h>
#include <sys/kmem.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.49.2.8 src/sys/dev/usb/umass_scsipi.c:1.49.2.9
--- src/sys/dev/usb/umass_scsipi.c:1.49.2.8 Sun Jan 29 10:13:51 2017
+++ src/sys/dev/usb/umass_scsipi.c Sun Jan 29 10:16:09 2017
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: umass_scsipi
#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 @@ __KERNEL_RCSID(0, "$NetBSD: umass_scsipi
#include <dev/scsipi/scsi_disk.h>
#include <dev/scsipi/scsi_changer.h>
-#include <sys/disk.h> /* XXX */
#include <dev/scsipi/sdvar.h> /* XXX */
/* USB */
