Index: sys/dev/nvdimm/nvdimm.c
===================================================================
--- sys/dev/nvdimm/nvdimm.c
+++ sys/dev/nvdimm/nvdimm.c
@@ -309,7 +309,8 @@
 	int i, error, num_dimms;
 
 	res = NULL;
-	error = devclass_get_devices(nvdimm_devclass, &dimms, &num_dimms);
+	error = devclass_get_devices(devclass_find("nvdimm"), &dimms,
+	    &num_dimms);
 	if (error != 0)
 		return (NULL);
 	for (i = 0; i < num_dimms; i++) {
Index: sys/dev/nvdimm/nvdimm_e820.c
===================================================================
--- sys/dev/nvdimm/nvdimm_e820.c
+++ sys/dev/nvdimm/nvdimm_e820.c
@@ -367,7 +367,7 @@
 
 	switch (e) {
 	case MOD_UNLOAD:
-		dc = nvdimm_e820_devclass;
+		dc = devclass_find(nvdimm_e820_driver.name);
 		maxunit = devclass_get_maxunit(dc);
 		for (i = 0; i < maxunit; i++) {
 			dev = devclass_get_device(dc, i);