3 files changed, 7 insertions, 35 deletions

diff --git a/sys/dev/vt/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c
index cac6f93b7af1..eda05ec3d203 100644
--- a/sys/dev/vt/hw/efifb/efifb.c
+++ b/sys/dev/vt/hw/efifb/efifb.c
@@ -77,17 +77,13 @@ vt_efifb_probe(struct vt_device *vd)
 {
 	int		disabled;
 	struct efi_fb	*efifb;
-	caddr_t		kmdp;
 
 	disabled = 0;
 	TUNABLE_INT_FETCH("hw.syscons.disable", &disabled);
 	if (disabled != 0)
 		return (CN_DEAD);
 
-	kmdp = preload_search_by_type("elf kernel");
-	if (kmdp == NULL)
-		kmdp = preload_search_by_type("elf64 kernel");
-	efifb = (struct efi_fb *)preload_search_info(kmdp,
+	efifb = (struct efi_fb *)preload_search_info(preload_kmdp,
 	    MODINFO_METADATA | MODINFOMD_EFI_FB);
 	if (efifb == NULL)
 		return (CN_DEAD);
@@ -100,7 +96,6 @@ vt_efifb_init(struct vt_device *vd)
 {
 	struct fb_info	*info;
 	struct efi_fb	*efifb;
-	caddr_t		kmdp;
 	int		memattr;
 	int		roff, goff, boff;
 	char		attr[16];
@@ -132,10 +127,7 @@ vt_efifb_init(struct vt_device *vd)
 	if (info == NULL)
 		info = vd->vd_softc = (void *)&local_info;
 
-	kmdp = preload_search_by_type("elf kernel");
-	if (kmdp == NULL)
-		kmdp = preload_search_by_type("elf64 kernel");
-	efifb = (struct efi_fb *)preload_search_info(kmdp,
+	efifb = (struct efi_fb *)preload_search_info(preload_kmdp,
 	    MODINFO_METADATA | MODINFOMD_EFI_FB);
 	if (efifb == NULL)
 		return (CN_DEAD);
diff --git a/sys/dev/vt/hw/vbefb/vbefb.c b/sys/dev/vt/hw/vbefb/vbefb.c
index 2d6ada6002d0..0f9d9257948c 100644
--- a/sys/dev/vt/hw/vbefb/vbefb.c
+++ b/sys/dev/vt/hw/vbefb/vbefb.c
@@ -77,17 +77,13 @@ vt_vbefb_probe(struct vt_device *vd)
 {
 	int		disabled;
 	struct vbe_fb	*vbefb;
-	caddr_t		kmdp;
 
 	disabled = 0;
 	TUNABLE_INT_FETCH("hw.syscons.disable", &disabled);
 	if (disabled != 0)
 		return (CN_DEAD);
 
-	kmdp = preload_search_by_type("elf kernel");
-	if (kmdp == NULL)
-		kmdp = preload_search_by_type("elf64 kernel");
-	vbefb = (struct vbe_fb *)preload_search_info(kmdp,
+	vbefb = (struct vbe_fb *)preload_search_info(preload_kmdp,
 	    MODINFO_METADATA | MODINFOMD_VBE_FB);
 	if (vbefb == NULL)
 		return (CN_DEAD);
@@ -100,17 +96,13 @@ vt_vbefb_init(struct vt_device *vd)
 {
 	struct fb_info	*info;
 	struct vbe_fb	*vbefb;
-	caddr_t		kmdp;
 	int		format, roff, goff, boff;
 
 	info = vd->vd_softc;
 	if (info == NULL)
 		info = vd->vd_softc = (void *)&local_vbe_info;
 
-	kmdp = preload_search_by_type("elf kernel");
-	if (kmdp == NULL)
-		kmdp = preload_search_by_type("elf64 kernel");
-	vbefb = (struct vbe_fb *)preload_search_info(kmdp,
+	vbefb = (struct vbe_fb *)preload_search_info(preload_kmdp,
 	    MODINFO_METADATA | MODINFOMD_VBE_FB);
 	if (vbefb == NULL)
 		return (CN_DEAD);
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 1be98466112e..b0f58b38a6f1 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -1675,15 +1675,11 @@ vtterm_done(struct terminal *tm)
 static void
 vtterm_splash(struct vt_device *vd)
 {
-	caddr_t kmdp;
 	struct splash_info *si;
 	uintptr_t image;
 	vt_axis_t top, left;
 
-	kmdp = preload_search_by_type("elf kernel");
-	if (kmdp == NULL)
-		kmdp = preload_search_by_type("elf64 kernel");
-	si = MD_FETCH(kmdp, MODINFOMD_SPLASH, struct splash_info *);
+	si = MD_FETCH(preload_kmdp, MODINFOMD_SPLASH, struct splash_info *);
 	if (!(vd->vd_flags & VDF_TEXTMODE) && (boothowto & RB_MUTE)) {
 		if (si == NULL) {
 			top = (vd->vd_height - vt_logo_height) / 2;
@@ -1806,14 +1802,10 @@ parse_font_info(struct font_info *fi)
 static void
 vt_init_font(void *arg)
 {
-	caddr_t kmdp;
 	struct font_info *fi;
 	struct vt_font *font;
 
-	kmdp = preload_search_by_type("elf kernel");
-	if (kmdp == NULL)
-		kmdp = preload_search_by_type("elf64 kernel");
-	fi = MD_FETCH(kmdp, MODINFOMD_FONT, struct font_info *);
+	fi = MD_FETCH(preload_kmdp, MODINFOMD_FONT, struct font_info *);
 
 	font = parse_font_info(fi);
 	if (font != NULL)
@@ -1825,14 +1817,10 @@ SYSINIT(vt_init_font, SI_SUB_KMEM, SI_ORDER_ANY, vt_init_font, &vt_consdev);
 static void
 vt_init_font_static(void)
 {
-	caddr_t kmdp;
 	struct font_info *fi;
 	struct vt_font *font;
 
-	kmdp = preload_search_by_type("elf kernel");
-	if (kmdp == NULL)
-		kmdp = preload_search_by_type("elf64 kernel");
-	fi = MD_FETCH(kmdp, MODINFOMD_FONT, struct font_info *);
+	fi = MD_FETCH(preload_kmdp, MODINFOMD_FONT, struct font_info *);
 
 	font = parse_font_info_static(fi);
 	if (font != NULL)