From nobody Fri May 6 21:44:12 2022 X-Original-To: dev-commits-src-main@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 DD11B1AD460D; Fri, 6 May 2022 21:44:13 +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 4Kw3x91twNz3nK0; Fri, 6 May 2022 21:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651873453; 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=X/PJYHuyurQjaEYqS7b0y2Mslq2O47zudNDAWTzNoWw=; b=b8sz6QiigK8plxB8M9O4VDwgeuzKmU6ndujQVsinZ+gmDyHUf4x3c0WGTjc0rxstUdbD8A F3eN6rLI1n6cMJKG8uHSPWpLbUlcjqQYISR4PkPNdfgFtFzkvmFj209nJTs+4+Pbv57xMg ir/3bEEtGvVKwZMRywebGp6DZKJCodw+/N7R1ELZdoqNzJcQRfZb/AxRnpuUBYY9Ga0nHI MNF3I+TGgE/vsgSzEy/HzNfFOoBe4fja5HZrPlFp5SH2cIzpfQTwYDU5aU7uOVFzV7x1vZ aMg/Zcak0MlerOt5qUdAvr+0V4XNLtf/tPocFwgPI0Zejiv1+0z+Vn2bI7yD6w== 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 0B2A123D80; Fri, 6 May 2022 21:44:13 +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 246LiC4R037638; Fri, 6 May 2022 21:44:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246LiCB5037637; Fri, 6 May 2022 21:44:12 GMT (envelope-from git) Date: Fri, 6 May 2022 21:44:12 GMT Message-Id: <202205062144.246LiCB5037637@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: 216ca4cee118 - main - nvdimm_e820: Use driver->name in identify method. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 216ca4cee1189ce1dd38b293c9dd431eb5ff8b02 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651873453; 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=X/PJYHuyurQjaEYqS7b0y2Mslq2O47zudNDAWTzNoWw=; b=rupQi1pRh0Yv0Tb/i48mrV2AzDd4G4XT2u81Dm54+jn4drLHoQ9HmJX8n5V+DULVdNQQ26 g/MqKShEZpxU2TNVNMPQCrTFPwA/Z4eP4jgs5mqD1qYQwzuw1xKUc8UxhyKNXwPG0OicEZ 9F36OVr0r2x6sO83QLU3BeG+7wncGBG2enFRtIIAilme5qU98mfgxyTq9mvbtxwvRI/56U xe53d3SnuAnXkQRqBcxJ05xRDaO7WQ/FW/RKFngAgUOW1snbWwcHvEZLhdTKbeYwvPWJ0j llsRatk/Cb31IjIZB2JzJTIZcjzyVNE74hCd0Lzt+pg9EyJ6R/Jy4K/LsHrYeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651873453; a=rsa-sha256; cv=none; b=f0qv+lnL/UnlauN6Ewh5hcfZY4SUB1MIohJUIFzTSY4fv2qkTP3EjfCxzDFOlp7ZSRUoDA 3O3ElFuWyHzLn0gpFeToYMq1v2XdV4ZOeRelD86Y07e19F6JpBBP6I/Y0z/7EwW7VEeavy HHH5mWio5oNCFMt2p3ZaoALyNS2Vyphzm4esdGLrsYY66FtJviDYxptAqm+Ms0goD/jOIE UKWvciKq285KkUjvwpcbYFktDm4zt+rH2wy+Oj//87GQ/+BNXn6Od4TBjfDcJn3LDk0ml9 AdlS5tfd4T/1Nau0IDomWupH+TFKqgSdw2DgGmFXu8BxZVyoM4O2IMDdsqRArA== 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=216ca4cee1189ce1dd38b293c9dd431eb5ff8b02 commit 216ca4cee1189ce1dd38b293c9dd431eb5ff8b02 Author: John Baldwin AuthorDate: 2022-05-06 21:42:02 +0000 Commit: John Baldwin CommitDate: 2022-05-06 21:42:02 +0000 nvdimm_e820: Use driver->name in identify method. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D35077 --- 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 97f825004ed0..35ca8c60d1d0 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