Module Name: src
Committed By: thorpej
Date: Sun Feb 16 14:56:52 UTC 2020
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/dev/fdt: fdt_subr.c fdtvar.h
Log Message:
Rename fdtbus_set_data() to fdtbus_init(). NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/fdt/fdt_subr.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/fdt/fdtvar.h
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/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.66 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.67
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.66 Tue Jan 21 10:54:11 2020
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Feb 16 14:56:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.66 2020/01/21 10:54:11 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.67 2020/02/16 14:56:52 thorpej Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.66 2020/01/21 10:54:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.67 2020/02/16 14:56:52 thorpej Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -494,7 +494,7 @@ initarm(void *arg)
error = fdt_open_into(fdt_addr_r, fdt_data, sizeof(fdt_data));
if (error != 0)
panic("fdt_move failed: %s", fdt_strerror(error));
- fdtbus_set_data(fdt_data);
+ fdtbus_init(fdt_data);
} else {
panic("fdt_check_header failed: %s", fdt_strerror(error));
}
Index: src/sys/dev/fdt/fdt_subr.c
diff -u src/sys/dev/fdt/fdt_subr.c:1.31 src/sys/dev/fdt/fdt_subr.c:1.32
--- src/sys/dev/fdt/fdt_subr.c:1.31 Tue Sep 24 15:23:34 2019
+++ src/sys/dev/fdt/fdt_subr.c Sun Feb 16 14:56:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.31 2019/09/24 15:23:34 jmcneill Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.32 2020/02/16 14:56:52 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.31 2019/09/24 15:23:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.32 2020/02/16 14:56:52 thorpej Exp $");
#include "opt_fdt.h"
@@ -43,7 +43,7 @@ static struct fdt_conslist fdt_console_l
TAILQ_HEAD_INITIALIZER(fdt_console_list);
bool
-fdtbus_set_data(const void *data)
+fdtbus_init(const void *data)
{
KASSERT(fdt_data == NULL);
if (fdt_check_header(data) != 0) {
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.57 src/sys/dev/fdt/fdtvar.h:1.58
--- src/sys/dev/fdt/fdtvar.h:1.57 Sat Nov 9 23:28:26 2019
+++ src/sys/dev/fdt/fdtvar.h Sun Feb 16 14:56:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.57 2019/11/09 23:28:26 jmcneill Exp $ */
+/* $NetBSD: fdtvar.h,v 1.58 2020/02/16 14:56:52 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -396,7 +396,7 @@ void fdtbus_power_poweroff(void);
device_t fdtbus_attach_i2cbus(device_t, int, i2c_tag_t, cfprint_t);
device_t fdtbus_attach_spibus(device_t, int, cfprint_t);
-bool fdtbus_set_data(const void *);
+bool fdtbus_init(const void *);
const void * fdtbus_get_data(void);
int fdtbus_phandle2offset(int);
int fdtbus_offset2phandle(int);
