diff options
| -rw-r--r-- | sys/arch/arm64/dev/mainbus.c | 3 | ||||
| -rw-r--r-- | sys/arch/arm64/dev/mainbus.h | 27 | ||||
| -rw-r--r-- | sys/arch/riscv64/dev/mainbus.c | 3 | ||||
| -rw-r--r-- | sys/arch/riscv64/dev/mainbus.h | 28 |
4 files changed, 2 insertions, 59 deletions
diff --git a/sys/arch/arm64/dev/mainbus.c b/sys/arch/arm64/dev/mainbus.c index b3a7da20672..b22b521bd51 100644 --- a/sys/arch/arm64/dev/mainbus.c +++ b/sys/arch/arm64/dev/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.30 2024/08/18 15:50:49 deraadt Exp $ */ +/* $OpenBSD: mainbus.c,v 1.31 2024/11/11 22:43:07 jsg Exp $ */ /* * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se> * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org> @@ -29,7 +29,6 @@ #include <dev/ofw/ofw_thermal.h> #include <arm64/arm64/arm64var.h> -#include <arm64/dev/mainbus.h> int mainbus_match(struct device *, void *, void *); void mainbus_attach(struct device *, struct device *, void *); diff --git a/sys/arch/arm64/dev/mainbus.h b/sys/arch/arm64/dev/mainbus.h deleted file mode 100644 index 5f63d0ec459..00000000000 --- a/sys/arch/arm64/dev/mainbus.h +++ /dev/null @@ -1,27 +0,0 @@ -/* $OpenBSD: mainbus.h,v 1.2 2017/04/27 10:23:19 kettenis Exp $ */ -/* - * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef __MAINBUS_H__ -#define __MAINBUS_H__ - -/* Passed as third arg to attach functions. */ -union mainbus_attach_args { - const char *ma_name; - struct fdt_attach_args ma_faa; -}; - -#endif /* __MAINBUS_H__ */ diff --git a/sys/arch/riscv64/dev/mainbus.c b/sys/arch/riscv64/dev/mainbus.c index b83626bb5b4..205860493ce 100644 --- a/sys/arch/riscv64/dev/mainbus.c +++ b/sys/arch/riscv64/dev/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.11 2024/08/18 15:50:49 deraadt Exp $ */ +/* $OpenBSD: mainbus.c,v 1.12 2024/11/11 22:43:07 jsg Exp $ */ /* * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se> @@ -27,7 +27,6 @@ #include <dev/ofw/fdt.h> #include <machine/riscv64var.h> -#include <riscv64/dev/mainbus.h> int mainbus_match(struct device *, void *, void *); void mainbus_attach(struct device *, struct device *, void *); diff --git a/sys/arch/riscv64/dev/mainbus.h b/sys/arch/riscv64/dev/mainbus.h deleted file mode 100644 index 020734479d7..00000000000 --- a/sys/arch/riscv64/dev/mainbus.h +++ /dev/null @@ -1,28 +0,0 @@ -/* $OpenBSD: mainbus.h,v 1.2 2021/05/12 01:20:52 jsg Exp $ */ - -/* - * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef __MAINBUS_H__ -#define __MAINBUS_H__ - -/* Passed as third arg to attach functions. */ -union mainbus_attach_args { - const char *ma_name; - struct fdt_attach_args ma_faa; -}; - -#endif /* __MAINBUS_H__ */ |