diff options
| author | riastradh <riastradh@NetBSD.org> | 2020-07-22 17:18:10 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2020-07-22 17:18:10 +0000 |
| commit | 50e3cb2018da047da4a1f76625607f2a2fee2ba7 (patch) | |
| tree | 09ab485d9741fedfb5bf586c028c47b7f5d250ef /sys/dev | |
| parent | 65a4597311324e04403ee872b959bfc761902f94 (diff) | |
Sort #includes. Nix trailing whitespace.
No functional change intended.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/bwfm.c | 20 | ||||
| -rw-r--r-- | sys/dev/scsipi/if_se.c | 43 | ||||
| -rw-r--r-- | sys/dev/sdmmc/ld_sdmmc.c | 20 | ||||
| -rw-r--r-- | sys/dev/usb/if_bwfm_usb.c | 22 |
4 files changed, 55 insertions, 50 deletions
diff --git a/sys/dev/ic/bwfm.c b/sys/dev/ic/bwfm.c index 64b498ae73f..f115fae1a3c 100644 --- a/sys/dev/ic/bwfm.c +++ b/sys/dev/ic/bwfm.c @@ -1,4 +1,4 @@ -/* $NetBSD: bwfm.c,v 1.26 2020/07/13 05:38:52 mrg Exp $ */ +/* $NetBSD: bwfm.c,v 1.27 2020/07/22 17:18:49 riastradh Exp $ */ /* $OpenBSD: bwfm.c,v 1.5 2017/10/16 22:27:16 patrick Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation @@ -18,21 +18,23 @@ */ #include <sys/param.h> -#include <sys/systm.h> +#include <sys/types.h> + #include <sys/buf.h> -#include <sys/kernel.h> #include <sys/device.h> +#include <sys/kernel.h> +#include <sys/kmem.h> +#include <sys/pcq.h> #include <sys/queue.h> #include <sys/socket.h> -#include <sys/kmem.h> +#include <sys/systm.h> #include <sys/workqueue.h> -#include <sys/pcq.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> @@ -381,7 +383,7 @@ bwfm_attach(struct bwfm_softc *sc) sizeof(bandlist))) { printf("%s: couldn't get supported band list\n", DEVNAME(sc)); return; - } + } const u_int nbands = le32toh(bandlist[0]); for (i = 1; i <= MIN(nbands, __arraycount(bandlist) - 1); i++) { switch (le32toh(bandlist[i])) { @@ -430,7 +432,7 @@ bwfm_attach(struct bwfm_softc *sc) return; /* Error */ } - + ieee80211_ifattach(ic); sc->sc_newstate = ic->ic_newstate; ic->ic_newstate = bwfm_newstate; @@ -579,7 +581,7 @@ bwfm_init(struct ifnet *ifp) #ifdef BWFM_DEBUG memset(evmask, 0xff, sizeof(evmask)); #endif - + if (bwfm_fwvar_var_set_data(sc, "event_msgs", evmask, sizeof(evmask))) { printf("%s: could not set event mask\n", DEVNAME(sc)); return EIO; diff --git a/sys/dev/scsipi/if_se.c b/sys/dev/scsipi/if_se.c index ba3920e40f0..47b98f52fc6 100644 --- a/sys/dev/scsipi/if_se.c +++ b/sys/dev/scsipi/if_se.c @@ -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.dall@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.109 2020/07/22 17:17:36 riastradh Exp $" #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 diff --git a/sys/dev/sdmmc/ld_sdmmc.c b/sys/dev/sdmmc/ld_sdmmc.c index 1cdd9906b97..39016111536 100644 --- a/sys/dev/sdmmc/ld_sdmmc.c +++ b/sys/dev/sdmmc/ld_sdmmc.c @@ -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> diff --git a/sys/dev/usb/if_bwfm_usb.c b/sys/dev/usb/if_bwfm_usb.c index 4b7fd97f543..76ea461e302 100644 --- a/sys/dev/usb/if_bwfm_usb.c +++ b/sys/dev/usb/if_bwfm_usb.c @@ -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.c,v 1.14 2020/07/22 17:17:37 riastradh E 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_selector bwfm_usb_fwtab[] = { 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"), |
