Date: Wed, 5 Feb 2025 19:49:46 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 7979205e0553 - main - new-bus: Rename bus_generic_get_resource_list to null_get_resource_list Message-ID: <202502051949.515JnkJu070204@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7979205e0553ed23b61faa473d9dd866872cb710 commit 7979205e0553ed23b61faa473d9dd866872cb710 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2025-02-05 19:22:25 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2025-02-05 19:22:25 +0000 new-bus: Rename bus_generic_get_resource_list to null_get_resource_list Make it static to bus_if.c similar to other null bus methods used as the default implementation of a bus method. Differential Revision: https://reviews.freebsd.org/D48362 --- sys/kern/bus_if.m | 8 +++++++- sys/kern/subr_bus.c | 11 ----------- sys/sys/bus.h | 2 -- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m index 74114ff7baee..14659958e4b9 100644 --- a/sys/kern/bus_if.m +++ b/sys/kern/bus_if.m @@ -84,6 +84,12 @@ CODE { { return (NULL); } + + static struct resource_list * + null_get_resource_list(device_t bus, device_t dev) + { + return (NULL); + } }; /** @@ -609,7 +615,7 @@ METHOD void delete_resource { METHOD struct resource_list * get_resource_list { device_t _dev; device_t _child; -} DEFAULT bus_generic_get_resource_list; +} DEFAULT null_get_resource_list; /** * @brief Return a struct rman. diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 0df0b883a32d..9506e471705c 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3866,17 +3866,6 @@ bus_generic_get_property(device_t dev, device_t child, const char *propname, return (-1); } -/** - * @brief Stub function for implementing BUS_GET_RESOURCE_LIST(). - * - * @returns NULL - */ -struct resource_list * -bus_generic_get_resource_list(device_t dev, device_t child) -{ - return (NULL); -} - /** * @brief Helper function for implementing BUS_DRIVER_ADDED(). * diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 84df9e6956d3..dda27f4737b2 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -457,8 +457,6 @@ int bus_generic_get_domain(device_t dev, device_t child, int *domain); ssize_t bus_generic_get_property(device_t dev, device_t child, const char *propname, void *propvalue, size_t size, device_property_type_t type); -struct resource_list * - bus_generic_get_resource_list(device_t, device_t); int bus_generic_map_resource(device_t dev, device_t child, struct resource *r, struct resource_map_request *args,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502051949.515JnkJu070204>