From nobody Fri May 20 00:21:06 2022 X-Original-To: dev-commits-src-branches@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 BF0FF1B40CCF; Fri, 20 May 2022 00:21:07 +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 4L46pB63SMz3kny; Fri, 20 May 2022 00:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653006067; 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=Mvh34BMamJ1OHDq9K5pwxe9gZ3/3Lp6ltZB5/SU/yes=; b=Ah2gHRSogmIPLdQ9MBKK8jd9sQB87g1tyVleONFPXkVp9Egi8lwvH/6XaPXBdb5Cat1gX8 q6ZJm7DIScp/bETgsCAIQ8vMvoKs7QdD5qJD0b9+nj8YWcFKVfZ72yHA8Jr0OhC2Z360av rSwnFvG6lDw6zE/ub0tPMBV94VtENbFGbomeydt0YmcjiHK43I0f1z2tFqyfR7QaFcP71n gPPgN0DPsRB2xL+6WibLifFym5Bn/J/n3/EUVhW3Ucye4mgNgK0K7pWVFL5yd/sPhQs6G+ ljnxSPdqY0RWa/gYxcIw5oipmBHkTNGQFCkiXw2BZWP06vDP0YWQrOiG7Bzckw== 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 687FC27E85; Fri, 20 May 2022 00:21:06 +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 24K0L6Ed071988; Fri, 20 May 2022 00:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24K0L6Z6071987; Fri, 20 May 2022 00:21:06 GMT (envelope-from git) Date: Fri, 20 May 2022 00:21:06 GMT Message-Id: <202205200021.24K0L6Z6071987@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: e6464fce46f2 - stable/13 - nvdimm_e820: Use driver->name in identify method. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e6464fce46f27a53c467420938b55231bb7f50ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653006067; 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=Mvh34BMamJ1OHDq9K5pwxe9gZ3/3Lp6ltZB5/SU/yes=; b=WYUNKPFezjVqDFxI2P4vo4M19ecvBkWg/UPw6dzjI+zhegBWDnBLj5GaBuGTIBOctaH0ds KboiYERHZSXGbZAR2aYod8we/PWnjqySrqT5Zgba7SPlKBAtFBgBajYSNP9mN2UhoVmIeQ n4HWZGLlcwYu8t1FuCtoaNllTERyvkjNRbCMrPH0VnARhPUySSm9Bye0gY08T9jPCqZcml VvT1a4zQYYL8kiM8WMo/550yoLe72pwGsGCp/L/EqFXvsSRv7vnzVmpllBfxSqvbMOr2Px aDDcVtw+IeqUeTOjZcYAXIxDTW3C0CGekV5IboNLzAyBNvl+g9xPN/i43MPUqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653006067; a=rsa-sha256; cv=none; b=arUdAkMdxtzFiKk5QqoAftkQg5YSZhzxC3VFGVgydJBumjr0djErvbmHTlQZKxoqZMNFSO gFZ9O18bKcKm0XzT19YDTU4kMxD4H2Q2I5qNIkh9hpKOTcU2WE7aAbiGkXLQqT40XzZw4P yclnaKUafrUUBCRd0Hag0u1rJTNCfrjvyPRO1EekenZjURm08Bzr8pC8xco0EDe122yvon VfKSPqldcNtWpFEfgqiFFuzOMwgHPnpIt+Af9eHh/eaNcW3Ksv91O8doVhT+pB80KXsiJ+ bjIjPI3KoDC4r2hspka1br2aGv+PUBIVOwf2pr8TdWa1OnxgTzcYpmxKyBvHMg== 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=e6464fce46f27a53c467420938b55231bb7f50ee commit e6464fce46f27a53c467420938b55231bb7f50ee Author: John Baldwin AuthorDate: 2022-05-06 21:42:02 +0000 Commit: John Baldwin CommitDate: 2022-05-19 22:01:50 +0000 nvdimm_e820: Use driver->name in identify method. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D35077 (cherry picked from commit 216ca4cee1189ce1dd38b293c9dd431eb5ff8b02) --- sys/dev/nvdimm/nvdimm_e820.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/nvdimm/nvdimm_e820.c b/sys/dev/nvdimm/nvdimm_e820.c index 66bdff937dc5..0ba8cfbc7868 100644 --- a/sys/dev/nvdimm/nvdimm_e820.c +++ b/sys/dev/nvdimm/nvdimm_e820.c @@ -257,15 +257,15 @@ nvdimm_e820_remove_spas(device_t dev) } static void -nvdimm_e820_identify(driver_t *driver __unused, device_t parent) +nvdimm_e820_identify(driver_t *driver, device_t parent) { device_t child; caddr_t kmdp; - if (resource_disabled(NVDIMM_E820, 0)) + if (resource_disabled(driver->name, 0)) return; /* Just create a single instance of the fake bus. */ - if (device_find_child(parent, NVDIMM_E820, -1) != NULL) + if (device_find_child(parent, driver->name, -1) != NULL) return; kmdp = preload_search_by_type("elf kernel"); @@ -278,9 +278,9 @@ nvdimm_e820_identify(driver_t *driver __unused, device_t parent) if (smapbase == NULL) return; - child = BUS_ADD_CHILD(parent, 0, NVDIMM_E820, -1); + child = BUS_ADD_CHILD(parent, 0, driver->name, -1); if (child == NULL) - device_printf(parent, "add %s child failed\n", NVDIMM_E820); + device_printf(parent, "add %s child failed\n", driver->name); } static int