Module Name: src
Committed By: skrll
Date: Sat Oct 24 07:08:22 UTC 2020
Modified Files:
src/sys/arch/arm/acpi: acpi_machdep.c acpi_pci_graviton.c
acpi_pci_n1sdp.c acpipchb.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/acpi/acpi_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/acpi/acpi_pci_graviton.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/acpi/acpi_pci_n1sdp.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/acpi/acpipchb.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/arch/arm/acpi/acpi_machdep.c
diff -u src/sys/arch/arm/acpi/acpi_machdep.c:1.19 src/sys/arch/arm/acpi/acpi_machdep.c:1.20
--- src/sys/arch/arm/acpi/acpi_machdep.c:1.19 Tue Jan 21 11:24:47 2020
+++ src/sys/arch/arm/acpi/acpi_machdep.c Sat Oct 24 07:08:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.19 2020/01/21 11:24:47 jmcneill Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.20 2020/10/24 07:08:22 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.19 2020/01/21 11:24:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.20 2020/10/24 07:08:22 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -502,7 +502,7 @@ arm_acpi_dma64_tag(struct acpi_softc *sc
if (ad->ad_dmat64 != NULL)
return ad->ad_dmat64;
-
+
dmat = kmem_alloc(sizeof(*dmat), KM_SLEEP);
*dmat = arm_generic_dma_tag;
Index: src/sys/arch/arm/acpi/acpi_pci_graviton.c
diff -u src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.3 src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.4
--- src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.3 Wed Jun 17 06:45:09 2020
+++ src/sys/arch/arm/acpi/acpi_pci_graviton.c Sat Oct 24 07:08:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_graviton.c,v 1.3 2020/06/17 06:45:09 thorpej Exp $ */
+/* $NetBSD: acpi_pci_graviton.c,v 1.4 2020/10/24 07:08:22 skrll Exp $ */
/*-
* Copyright (c) 2018, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_graviton.c,v 1.3 2020/06/17 06:45:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_graviton.c,v 1.4 2020/10/24 07:08:22 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -67,7 +67,7 @@ acpi_pci_graviton_conf_read(pci_chipset_
*data = bus_space_read_4(ap->ap_bst, ap->ap_conf_bsh, reg);
return 0;
}
-
+
return acpimcfg_conf_read(pc, tag, reg, data);
}
@@ -86,7 +86,7 @@ acpi_pci_graviton_conf_write(pci_chipset
bus_space_write_4(ap->ap_bst, ap->ap_conf_bsh, reg, data);
return 0;
}
-
+
return acpimcfg_conf_write(pc, tag, reg, data);
}
Index: src/sys/arch/arm/acpi/acpi_pci_n1sdp.c
diff -u src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.5 src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.6
--- src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.5 Sun Sep 13 21:41:17 2020
+++ src/sys/arch/arm/acpi/acpi_pci_n1sdp.c Sat Oct 24 07:08:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_n1sdp.c,v 1.5 2020/09/13 21:41:17 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_n1sdp.c,v 1.6 2020/10/24 07:08:22 skrll Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_n1sdp.c,v 1.5 2020/09/13 21:41:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_n1sdp.c,v 1.6 2020/10/24 07:08:22 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -83,7 +83,7 @@ acpi_pci_n1sdp_valid(pci_chipset_tag_t p
pci_decompose_tag(pc, tag, &b, &d, &f);
- bdfaddr = (b << N1SDP_BUS_SHIFT) +
+ bdfaddr = (b << N1SDP_BUS_SHIFT) +
(d << N1SDP_DEV_SHIFT) +
(f << N1SDP_FUNC_SHIFT);
@@ -116,7 +116,7 @@ acpi_pci_n1sdp_conf_read(pci_chipset_tag
*data = -1;
return 0;
}
-
+
return acpimcfg_conf_read(pc, tag, reg, data);
}
@@ -138,7 +138,7 @@ acpi_pci_n1sdp_conf_write(pci_chipset_ta
if (!acpi_pci_n1sdp_valid(pc, tag))
return 0;
-
+
return acpimcfg_conf_write(pc, tag, reg, data);
}
Index: src/sys/arch/arm/acpi/acpipchb.c
diff -u src/sys/arch/arm/acpi/acpipchb.c:1.20 src/sys/arch/arm/acpi/acpipchb.c:1.21
--- src/sys/arch/arm/acpi/acpipchb.c:1.20 Wed Jun 17 06:46:09 2020
+++ src/sys/arch/arm/acpi/acpipchb.c Sat Oct 24 07:08:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpipchb.c,v 1.20 2020/06/17 06:46:09 thorpej Exp $ */
+/* $NetBSD: acpipchb.c,v 1.21 2020/10/24 07:08:22 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.20 2020/06/17 06:46:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.21 2020/10/24 07:08:22 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -188,7 +188,7 @@ acpipchb_bus_space_map(void *t, bus_addr
for (i = 0; i < abs->nrange; i++) {
struct acpipchb_bus_range * const range = &abs->range[i];
- if (bpa >= range->min && bpa + size - 1 <= range->max)
+ if (bpa >= range->min && bpa + size - 1 <= range->max)
return abs->map(t, bpa + range->offset, size, flag, bshp);
}
