Module Name: src
Committed By: skrll
Date: Tue Jan 22 06:46:21 UTC 2019
Modified Files:
src/sys/dev/usb: umass_isdata.c umass_scsipi.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.56 -r1.57 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_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.39 src/sys/dev/usb/umass_isdata.c:1.40
--- src/sys/dev/usb/umass_isdata.c:1.39 Mon Oct 22 21:23:16 2018
+++ src/sys/dev/usb/umass_isdata.c Tue Jan 22 06:46:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.39 2018/10/22 21:23:16 jdolecek Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.40 2019/01/22 06:46:21 skrll Exp $ */
/*
* TODO:
@@ -37,21 +37,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.39 2018/10/22 21:23:16 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.40 2019/01/22 06:46:21 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/malloc.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.56 src/sys/dev/usb/umass_scsipi.c:1.57
--- src/sys/dev/usb/umass_scsipi.c:1.56 Tue Nov 13 10:30:57 2018
+++ src/sys/dev/usb/umass_scsipi.c Tue Jan 22 06:46:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.56 2018/11/13 10:30:57 mlelstv Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.57 2019/01/22 06:46:21 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.56 2018/11/13 10:30:57 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.57 2019/01/22 06:46:21 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 */
