Module Name: src
Committed By: msaitoh
Date: Tue Feb 18 04:09:32 UTC 2020
Modified Files:
src/sys/dev/pci: ichsmb.c if_an_pci.c
Log Message:
Whitespace fix. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/if_an_pci.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/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.65 src/sys/dev/pci/ichsmb.c:1.66
--- src/sys/dev/pci/ichsmb.c:1.65 Tue Dec 24 06:27:17 2019
+++ src/sys/dev/pci/ichsmb.c Tue Feb 18 04:09:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.65 2019/12/24 06:27:17 thorpej Exp $ */
+/* $NetBSD: ichsmb.c,v 1.66 2020/02/18 04:09:31 msaitoh Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.65 2019/12/24 06:27:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.66 2020/02/18 04:09:31 msaitoh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -308,7 +308,7 @@ ichsmb_i2c_exec(void *cookie, i2c_op_t o
LPCIB_SMB_HS_INTR | LPCIB_SMB_HS_DEVERR |
LPCIB_SMB_HS_BUSERR | LPCIB_SMB_HS_FAILED);
bus_space_barrier(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, 1,
- BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
/* Wait for bus to be idle */
for (retries = 100; retries > 0; retries--) {
Index: src/sys/dev/pci/if_an_pci.c
diff -u src/sys/dev/pci/if_an_pci.c:1.36 src/sys/dev/pci/if_an_pci.c:1.37
--- src/sys/dev/pci/if_an_pci.c:1.36 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/if_an_pci.c Tue Feb 18 04:09:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pci.c,v 1.36 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: if_an_pci.c,v 1.37 2020/02/18 04:09:31 msaitoh Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.36 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.37 2020/02/18 04:09:31 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,7 +116,7 @@ an_pci_match(device_t parent, cfdata_t m
static void
an_pci_attach(device_t parent, device_t self, void *aux)
{
- struct pci_attach_args *pa = (struct pci_attach_args *)aux;
+ struct pci_attach_args *pa = (struct pci_attach_args *)aux;
struct an_pci_softc *psc = device_private(self);
struct an_softc *sc = &psc->sc_an;
char const *intrstr;
@@ -131,21 +131,21 @@ an_pci_attach(device_t parent, device_t
pci_aprint_devinfo(pa, "802.11 controller");
- /* Map I/O registers */
- if (pci_mapreg_map(pa, AN_PCI_IOBA, PCI_MAPREG_TYPE_IO, 0,
+ /* Map I/O registers */
+ if (pci_mapreg_map(pa, AN_PCI_IOBA, PCI_MAPREG_TYPE_IO, 0,
&sc->sc_iot, &sc->sc_ioh, NULL, &iosize) != 0) {
- aprint_error_dev(self, "unable to map registers\n");
- return;
- }
-
- /* Enable the device. */
- csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
- pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
- csr | PCI_COMMAND_MASTER_ENABLE);
+ aprint_error_dev(self, "unable to map registers\n");
+ return;
+ }
+
+ /* Enable the device. */
+ csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+ pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
+ csr | PCI_COMMAND_MASTER_ENABLE);
/* Map and establish the interrupt. */
if (pci_intr_map(pa, &ih)) {
- aprint_error_dev(self, "unable to map interrupt\n");
+ aprint_error_dev(self, "unable to map interrupt\n");
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
