From nobody Wed Feb 5 19:49:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yp9mp5rkZz5mHsS; Wed, 05 Feb 2025 19:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9mp56bmz3ty7; Wed, 05 Feb 2025 19:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUNsBm0whWru5PgCwCoVCdJKf3u3IsGWX08LiqDqDBU=; b=iDNQielc0psjQOLaQWGbzqxIV25PC5c+WKr3rgGefmAMa/rsDGrsYP8uQGeC8jAjK6Bpl1 zyMESh7HKq75CyvfhHSIvRGtm6IRnwz6xzTuJod5jbLZEl1oYoNqgWaYdGxr4pvZnapio1 qhr5UmpTwfd7uVEbCx+u3gf1zfBR5jrFNz7hJ8w5C3++NKSxwwHZHPf7b/PuavleYbaR7x U4xhLpUAi8OtVlc5nUNMTQnI7/cuNICGzHJ+2KYYcG9CsSpiI71j7JCGhmk4N1GwfKXKTZ CCEfeH8HeO08jVRCikN/TQ1lkYkwwUW/Ju214xQq3CSTcg4zFkb968k/iAJ8+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUNsBm0whWru5PgCwCoVCdJKf3u3IsGWX08LiqDqDBU=; b=p+sn/HGPbKPHbihFZ1jvNfZwl7sOJC4q8cpkpwZqqq5an/kvhOk4JbP872a5bEv8Mlet1Q ZGFUwBCbG27hqvGwcgsuDrYBV6kxXytO8wEdRgnSVTLmRk3cvhQ62eUfeOfxF/ebmh40Tw fCP7mHur1FVFU84B62fi1n16tIImgC0NKThEPFbQpDlJqf6NvlgfcwAT7q8eH7KaLu6sPV LUor2++GtUi/kt8wLXLXO1MQtZPSOHbk4j6sma4KbQQMSoyFrFftcuUjD519VoMn5zBtOz Sk89E93gakUgJN1CE/mKAZon7axwTWVKTnn71uUHNai/VNfxju6HdwoIoDfH5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784986; a=rsa-sha256; cv=none; b=JKNZsaGHIMSOlrTnM4uosI3KUbcyKDfVIjGOfWIZ0NHla8S3ZMWzhGxwaHf0psQjtVeIQY IC1QSlfWwSHcMEF0ea+iC+/3GrnH2gcdw9TnQtVIstGh7STcSPHLWWIXb5DDOS00fURVVV nsbtCm9AM1tyWhTb+cpkOT/+pVjFcroK89zkJK9ywr3ta4hc6c01ffFXFhsLoMHGnFc3wU 0LsG2bsCCi6NZUAyNlAwVhjXRrY2z9SVrg+hhM09Krnsy3SVQ5xDXrEomvGm1f6ZG5SXaI 0BMUzkX3kg+yE0n5PzP2qu5eq6oADqhod7t8MS0KePq4R/Kfi4uf2FZEKIuL5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yp9mp4jWrz15P4; Wed, 05 Feb 2025 19:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 515Jnkal070208; Wed, 5 Feb 2025 19:49:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JnkJu070204; Wed, 5 Feb 2025 19:49:46 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:49:46 GMT Message-Id: <202502051949.515JnkJu070204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7979205e0553 - main - new-bus: Rename bus_generic_get_resource_list to null_get_resource_list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7979205e0553ed23b61faa473d9dd866872cb710 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7979205e0553ed23b61faa473d9dd866872cb710 commit 7979205e0553ed23b61faa473d9dd866872cb710 Author: John Baldwin AuthorDate: 2025-02-05 19:22:25 +0000 Commit: John Baldwin 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,