From nobody Tue Apr 19 17:45:43 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 0B5FB11D4789; Tue, 19 Apr 2022 17:45:44 +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 4KjWRq6xGFz3sr2; Tue, 19 Apr 2022 17:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650390344; 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=8dbJ+kVJNX/LbQwb7lqAjtnvv4DW/ifZ8OeuKEpEknI=; b=oTA7l0sjkcLhS81ABtuh7UJkSK77FurQUHcdrJ9tdVMcKAvaOEr8adB9WPatdnNVOCXuRN 0g4PlSnmf1aXxJNhpYs/gI+QvqET8t7xf+OSbaH80EeGi59IrYKii/YofTIYd9epcWvWC9 VIOlr/nirgHLlGLIhbBJYGfPYBG+SZAhmP/ded2C5KhErFLxXSTfFzEVFs/G3QFARsyiof pyXB4euPi+1A5ZYXd58i41jkp0cj0FwjQaQOzS7TFzn35adKF5hkbe9frOs9MJ+qhZl8Ez UpaQMxP0o808hB7+WTKgg8YoMICBADZOrNYchhaXrr+s1sp8oGnX3YOX25VJgg== 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 CD55E2BF80; Tue, 19 Apr 2022 17:45:43 +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 23JHjhnJ037877; Tue, 19 Apr 2022 17:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JHjhiZ037876; Tue, 19 Apr 2022 17:45:43 GMT (envelope-from git) Date: Tue, 19 Apr 2022 17:45:43 GMT Message-Id: <202204191745.23JHjhiZ037876@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: 5bdea8826bdd - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5bdea8826bdd48e2221f1b436ce86021ede412f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650390344; 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=8dbJ+kVJNX/LbQwb7lqAjtnvv4DW/ifZ8OeuKEpEknI=; b=u59G+BT9zVkYd55NBavmSdwgrwK0do+Jg997oUA1VjMYcjHeyuIwY2vKLDn47CI45WodvN lZ9/ZKvAesmya6nwTPSX1RNYJy2JLVPyFPicVZUX98fcfWsxwGFJ/skdbXUKde09IHFltF 9zRhSqNq7lSeOfHM4VHcE9MF/k82TOniGQ1h83gD+EVSKeSOGXaqfrKI74hlK89EWWUHDM +3Q9l5wd43MKyoLg7/wSRbcKmDS0uL18dtp/db6SOkW4zXNVrNjgb49f+ku0Ac3qAQ9sdq uMSMeNQ1V1ZfqZ0Mbk9c3/aC91nCvqnH2ELDU09Ljb6QUfzbr6rKTFoeD+oyAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650390344; a=rsa-sha256; cv=none; b=YY3Cd7FZH6x9iN7hYBIBF2GPj6yuuEhKMW1x0uVsz0e3QsDf9TfXv2y4ULc5kO8dMa9zV1 dzUADSrW3h03aQIECE/762wSTyOZGiL/3UQ+X+f+7XYyq3wdKAD3DRwfewU0gx5PvjWtkW HQnNl5dkoGBlmhoOsygApBJ+KmApLpXRC6/nU2sKX7XiHPty16o7TTru86vW1W+qg9uLDZ Ejq3uUZnDHDnGD1doUhx5i3ykntLEeuigyLWjKWDkJAyYkajL5LJ9XkuxHp/1HxtrRI1he +Yx6nMTv35rDmJRb4NhD3Kbb/bE5A7Mk71PLXjSeox2CPKDl7FW+8f11XiswWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5bdea8826bdd48e2221f1b436ce86021ede412f2 commit 5bdea8826bdd48e2221f1b436ce86021ede412f2 Author: John Baldwin AuthorDate: 2022-04-19 17:42:38 +0000 Commit: John Baldwin CommitDate: 2022-04-19 17:43:50 +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 --- 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 416353566306..3be468fd7c43 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -1140,6 +1140,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))); @@ -1171,7 +1172,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);