Module Name: src
Committed By: riastradh
Date: Wed Jul 22 17:18:10 UTC 2020
Modified Files:
src/sys/dev/scsipi: if_se.c
src/sys/dev/sdmmc: ld_sdmmc.c
src/sys/dev/usb: if_bwfm_usb.c
Log Message:
Sort #includes. Nix trailing whitespace.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/scsipi/if_se.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/sdmmc/ld_sdmmc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/if_bwfm_usb.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/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.109 src/sys/dev/scsipi/if_se.c:1.110
--- src/sys/dev/scsipi/if_se.c:1.109 Wed Jul 22 17:17:36 2020
+++ src/sys/dev/scsipi/if_se.c Wed Jul 22 17:18:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.109 2020/07/22 17:17:36 riastradh Exp $ */
+/* $NetBSD: if_se.c,v 1.110 2020/07/22 17:18:10 riastradh Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.d...@dsto.defence.gov.au>
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.109 2020/07/22 17:17:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.110 2020/07/22 17:18:10 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -68,49 +68,48 @@ __KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.
#endif
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/types.h>
+
+#include <sys/buf.h>
#include <sys/callout.h>
-#include <sys/syslog.h>
-#include <sys/kernel.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/disk.h>
+#include <sys/disklabel.h>
+#include <sys/errno.h>
#include <sys/file.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <sys/buf.h>
-#include <sys/uio.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/disklabel.h>
-#include <sys/disk.h>
-#include <sys/proc.h>
-#include <sys/conf.h>
+#include <sys/mbuf.h>
#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/syslog.h>
+#include <sys/systm.h>
+#include <sys/uio.h>
#include <sys/workqueue.h>
-#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_ctron_ether.h>
#include <dev/scsipi/scsiconf.h>
+#include <dev/scsipi/scsipi_all.h>
-#include <sys/mbuf.h>
-
-#include <sys/socket.h>
+#include <net/bpf.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <net/bpf.h>
#ifdef INET
-#include <netinet/in.h>
#include <netinet/if_inarp.h>
+#include <netinet/in.h>
#endif
-
#ifdef NETATALK
#include <netatalk/at.h>
#endif
-
#define SETIMEOUT 1000
#define SEOUTSTANDING 4
#define SERETRIES 4
Index: src/sys/dev/sdmmc/ld_sdmmc.c
diff -u src/sys/dev/sdmmc/ld_sdmmc.c:1.39 src/sys/dev/sdmmc/ld_sdmmc.c:1.40
--- src/sys/dev/sdmmc/ld_sdmmc.c:1.39 Wed Jul 22 17:17:37 2020
+++ src/sys/dev/sdmmc/ld_sdmmc.c Wed Jul 22 17:18:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_sdmmc.c,v 1.39 2020/07/22 17:17:37 riastradh Exp $ */
+/* $NetBSD: ld_sdmmc.c,v 1.40 2020/07/22 17:18:10 riastradh Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
@@ -28,27 +28,29 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.39 2020/07/22 17:17:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.40 2020/07/22 17:18:10 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
#endif
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
+#include <sys/types.h>
+
#include <sys/buf.h>
#include <sys/bufq.h>
#include <sys/bus.h>
-#include <sys/endian.h>
-#include <sys/dkio.h>
+#include <sys/device.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
+#include <sys/dkio.h>
+#include <sys/endian.h>
+#include <sys/kernel.h>
+#include <sys/kmem.h>
#include <sys/kthread.h>
-#include <sys/syslog.h>
#include <sys/module.h>
-#include <sys/kmem.h>
+#include <sys/syslog.h>
+#include <sys/systm.h>
#include <dev/ldvar.h>
Index: src/sys/dev/usb/if_bwfm_usb.c
diff -u src/sys/dev/usb/if_bwfm_usb.c:1.14 src/sys/dev/usb/if_bwfm_usb.c:1.15
--- src/sys/dev/usb/if_bwfm_usb.c:1.14 Wed Jul 22 17:17:37 2020
+++ src/sys/dev/usb/if_bwfm_usb.c Wed Jul 22 17:18:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwfm_usb.c,v 1.14 2020/07/22 17:17:37 riastradh Exp $ */
+/* $NetBSD: if_bwfm_usb.c,v 1.15 2020/07/22 17:18:10 riastradh Exp $ */
/* $OpenBSD: if_bwfm_usb.c,v 1.2 2017/10/15 14:55:13 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -18,34 +18,36 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bwfm_usb.c,v 1.14 2020/07/22 17:17:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bwfm_usb.c,v 1.15 2020/07/22 17:18:10 riastradh Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/types.h>
+
#include <sys/buf.h>
+#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/device.h>
+#include <sys/mutex.h>
#include <sys/queue.h>
#include <sys/socket.h>
-#include <sys/mutex.h>
+#include <sys/systm.h>
#include <sys/workqueue.h>
#include <net/bpf.h>
#include <net/if.h>
#include <net/if_dl.h>
-#include <net/if_media.h>
#include <net/if_ether.h>
+#include <net/if_media.h>
#include <netinet/in.h>
#include <net80211/ieee80211_var.h>
#include <dev/usb/usb.h>
+#include <dev/usb/usbdevs.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usbdevs.h>
#include <dev/ic/bwfmreg.h>
#include <dev/ic/bwfmvar.h>
@@ -53,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_bwfm_usb.
static const struct bwfm_firmware_selector bwfm_usb_fwtab[] = {
BWFM_FW_ENTRY(BRCM_CC_43143_CHIP_ID,
BWFM_FWSEL_ALLREVS, "brcmfmac43143"),
-
+
BWFM_FW_ENTRY(BRCM_CC_43235_CHIP_ID,
BWFM_FWSEL_REV_EQ(3), "brcmfmac43236b"),
BWFM_FW_ENTRY(BRCM_CC_43236_CHIP_ID,
@@ -63,12 +65,12 @@ static const struct bwfm_firmware_select
BWFM_FW_ENTRY(BRCM_CC_43242_CHIP_ID,
BWFM_FWSEL_ALLREVS, "brcmfmac43242a"),
-
+
BWFM_FW_ENTRY(BRCM_CC_43566_CHIP_ID,
BWFM_FWSEL_ALLREVS, "brcmfmac43569"),
BWFM_FW_ENTRY(BRCM_CC_43569_CHIP_ID,
BWFM_FWSEL_ALLREVS, "brcmfmac43569"),
-
+
BWFM_FW_ENTRY(CY_CC_4373_CHIP_ID,
BWFM_FWSEL_ALLREVS, "brcmfmac4373"),
