The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5df74441b35f2303ecdc7b79f9d331f5e77a07db
commit 5df74441b35f2303ecdc7b79f9d331f5e77a07db Author: Mitchell Horne <[email protected]> AuthorDate: 2024-06-04 23:17:47 +0000 Commit: Mitchell Horne <[email protected]> CommitDate: 2024-06-04 23:17:47 +0000 devmap: eliminate unused arguments The optional 'table' pointer is a legacy part of the interface, which has been replaced by devmap_register_table()/devmap_add_entry(). The few in-tree callers have already adapted to this, so it can be removed. The 'l1pt' argument is already entirely unused within the function. Reviewed by: andrew, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45319 --- sys/arm/arm/machdep.c | 2 +- sys/arm64/arm64/machdep.c | 2 +- sys/kern/subr_devmap.c | 17 ++++------------- sys/riscv/riscv/machdep.c | 2 +- sys/sys/devmap.h | 7 +++---- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index c36953c513be..f54113e3d0ca 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -551,7 +551,7 @@ initarm(struct arm_boot_params *abp) /* Establish static device mappings. */ err_devmap = platform_devmap_init(); - devmap_bootstrap(0, NULL); + devmap_bootstrap(); vm_max_kernel_address = platform_lastaddr(); /* diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 517f4e7c2e23..e7d46ff70531 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -996,7 +996,7 @@ initarm(struct arm64_bootparams *abp) physmem_init_kernel_globals(); - devmap_bootstrap(0, NULL); + devmap_bootstrap(); valid = bus_probe(); diff --git a/sys/kern/subr_devmap.c b/sys/kern/subr_devmap.c index 441ffeb1270a..3ab20a2a4d43 100644 --- a/sys/kern/subr_devmap.c +++ b/sys/kern/subr_devmap.c @@ -165,28 +165,19 @@ devmap_register_table(const struct devmap_entry *table) /* * Map all of the static regions in the devmap table, and remember the devmap * table so the mapdev, ptov, and vtop functions can do lookups later. - * - * If a non-NULL table pointer is given it is used unconditionally, otherwise - * the previously-registered table is used. This smooths transition from legacy - * code that fills in a local table then calls this function passing that table, - * and newer code that uses devmap_register_table() in platform-specific - * code, then lets the common platform-specific init function call this function - * with a NULL pointer. */ void -devmap_bootstrap(vm_offset_t l1pt, const struct devmap_entry *table) +devmap_bootstrap(void) { const struct devmap_entry *pd; devmap_bootstrap_done = true; /* - * If given a table pointer, use it. Otherwise, if a table was - * previously registered, use it. Otherwise, no work to do. + * If a table was previously registered, use it. Otherwise, no work to + * do. */ - if (table != NULL) - devmap_table = table; - else if (devmap_table == NULL) + if (devmap_table == NULL) return; for (pd = devmap_table; pd->pd_size != 0; ++pd) { diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 4e3564b11c9e..f44056f56212 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -568,7 +568,7 @@ initriscv(struct riscv_bootparams *rvbp) physmem_init_kernel_globals(); /* Establish static device mappings */ - devmap_bootstrap(0, NULL); + devmap_bootstrap(); cninit(); diff --git a/sys/sys/devmap.h b/sys/sys/devmap.h index 786608e0ce30..914bec31af4c 100644 --- a/sys/sys/devmap.h +++ b/sys/sys/devmap.h @@ -71,11 +71,10 @@ void devmap_register_table(const struct devmap_entry * _table); * Establish mappings for all the entries in the table. This is called * automatically from the common platform-specific init function in * <ARCH>/machdep.c, and also from the custom platform-specific init routines - * in older code. If the table pointer is NULL, this will use the table - * installed previously by devmap_register_table(). + * in older code. This function only has an effect when a table was installed + * previously by devmap_register_table(). */ -void devmap_bootstrap(vm_offset_t _l1pt, - const struct devmap_entry *_table); +void devmap_bootstrap(void); /* * Translate between virtual and physical addresses within a region that is
