The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bf264886cdc6bed7a2da88498a5f8d2ae882abb4
commit bf264886cdc6bed7a2da88498a5f8d2ae882abb4 Author: John Baldwin <[email protected]> AuthorDate: 2022-04-13 23:08:20 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-13 23:08:20 +0000 nvdimm: Inline value of variable used once in an assertion. --- sys/dev/nvdimm/nvdimm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/nvdimm/nvdimm.c b/sys/dev/nvdimm/nvdimm.c index 3dde7e3fc037..a5692fc65857 100644 --- a/sys/dev/nvdimm/nvdimm.c +++ b/sys/dev/nvdimm/nvdimm.c @@ -338,7 +338,6 @@ nvdimm_attach(device_t dev) struct sysctl_oid_list *children; struct sbuf *sb; ACPI_TABLE_NFIT *nfitbl; - ACPI_HANDLE handle; ACPI_STATUS status; ACPI_NFIT_MEMORY_MAP **maps; int error, i, num_maps; @@ -348,8 +347,7 @@ nvdimm_attach(device_t dev) ctx = device_get_sysctl_ctx(dev); oid = device_get_sysctl_tree(dev); children = SYSCTL_CHILDREN(oid); - handle = nvdimm_root_get_acpi_handle(dev); - MPASS(handle != NULL); + MPASS(nvdimm_root_get_acpi_handle(dev) != NULL); nv->nv_dev = dev; nv->nv_handle = nvdimm_root_get_device_handle(dev);
