From nobody Tue May 17 23:38:10 2022 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 099971ADE678; Tue, 17 May 2022 23:38:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L2sxZ6phxz3Dm3; Tue, 17 May 2022 23:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652830691; 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=Hw2kB7eWL77cw9zCB8NbDpzYCF6lDK0WXfIH/1r86Io=; b=biqUTWfWYrHPEYaa/Aq2T3DysC3kOf0VznQCoV1LUy9zaJ3hJEWv1ihPkds72/2p5CbkuM 5k3tLBA7kIamN89Qa4vphDZkj93S5S1Quzm/EHNg4BvFkd1ILZgnm9Iri23nr8AC+yNzjs He5hyrI/fAJMKIpyJMQkFmIdv0qXXZhgB8APKEV7U9Ij978T01hOEwINHC2cwc/i4kujbI 93O8Zbm2zDOC6R1ib/wel+gwzx8YaY5f3JFto23UGePlJfaIjii3sYA7zA2XTFmqVSyHfo Y9D2vPz9YLddWY2n1dG+nVXwGGeuEnovgkOaF7s/YEuMQIjVqFQIu/e5uHrnZA== 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 C97901E31A; Tue, 17 May 2022 23:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24HNcA2o011343; Tue, 17 May 2022 23:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HNcAfe011342; Tue, 17 May 2022 23:38:10 GMT (envelope-from git) Date: Tue, 17 May 2022 23:38:10 GMT Message-Id: <202205172338.24HNcAfe011342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: eae3c14a2846 - stable/13 - devclass_add_driver: Permit NULL to be passed in dcp. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: eae3c14a28469f047362b96de876ee7d64694ae3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652830691; 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=Hw2kB7eWL77cw9zCB8NbDpzYCF6lDK0WXfIH/1r86Io=; b=NnmOG/z0qV7D2jlf/Z5TcMNiw9WINwKD3drNUl3AVj6zrqWuk1GhZUhupVHTpkdUQdWgLp ZgN8jJQ2VO5ZYqZsbowSl036BoMOi6ONx4gW3W9ub/J++Ch9QevY3BsMqqwWaIjYHcRk+7 nNBZAZIKxen3FKBcq6B6oV976p4oxeN74yTnxoC8XPGhiEcBII+AX68yCu2h4r8HyQIZlH aRbj6SqngGo8MhXHRBSzF0fcikEwxO27+bojqG5a7q/+bhzxW83goXO6bbKFh0KLYYVV3v RCTOPGPBA2+wbNXqRswoJ4aBcWWsWANFPIkUKshlXEVgVauhFrMcR483eYRVSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652830691; a=rsa-sha256; cv=none; b=w3WjmCQsnRl0d420F83/AZ7K90/SkgPa+zvJURBF/LuZsZs2sWF5CQ1yc71L+l9vpv6Ute as0f/4T+Y1/QXFGLYj+cTmNMqp1FbO3Ag7wP1NmZS9bexoucSy8Gs94qvUsJWeaW/MgjKS BacgG/3xwhMg6J8EYE9RF2gWMHuEN7SLDsu7rj4MVwGKMcddp7w8wMchZTpbNmm3oOCit8 GysEnipDxQAVx0ju+0/aOD067kKR1qgkATFLCI2c/2JBoaA9U4O0TSedjVSMTOwI7+9Lva 4Ds0u1GA2nAkZaI5l/jnmRu5sBNHlrhqLvZ5Zih/8mQqmZbsLJE/bSbKNQTXgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eae3c14a28469f047362b96de876ee7d64694ae3 commit eae3c14a28469f047362b96de876ee7d64694ae3 Author: John Baldwin AuthorDate: 2022-04-19 17:42:38 +0000 Commit: John Baldwin CommitDate: 2022-05-17 21:16:13 +0000 devclass_add_driver: Permit NULL to be passed in dcp. This permits a driver module structure that doesn't want to store a pointer to the new driver's devclass. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D34962 (cherry picked from commit 5bdea8826bdd48e2221f1b436ce86021ede412f2) --- sys/kern/subr_bus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 42657034550f..8b7bcbf4e3e0 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -1110,6 +1110,7 @@ int devclass_add_driver(devclass_t dc, driver_t *driver, int pass, devclass_t *dcp) { driverlink_t dl; + devclass_t child_dc; const char *parentname; PDEBUG(("%s", DRIVERNAME(driver))); @@ -1141,7 +1142,9 @@ devclass_add_driver(devclass_t dc, driver_t *driver, int pass, devclass_t *dcp) parentname = driver->baseclasses[0]->name; else parentname = NULL; - *dcp = devclass_find_internal(driver->name, parentname, TRUE); + child_dc = devclass_find_internal(driver->name, parentname, TRUE); + if (dcp != NULL) + *dcp = child_dc; dl->driver = driver; TAILQ_INSERT_TAIL(&dc->drivers, dl, link);