From: mikeb <mikeb@openbsd.org>
Date: Thu, 15 Jun 2017 20:12:12 +0000 (+0000)
Subject: Don't defer attaching PV devices
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=175c85ce51f81bd7862c7d82a4173fcc0c9c3acc;p=openbsd

Don't defer attaching PV devices

Now that both hvn(4) and hvs(4) can perform VMBus channel operations
during autoconf, it's no longer necessary to defer their attachment.
---

diff --git a/sys/dev/pv/hyperv.c b/sys/dev/pv/hyperv.c
index 808fcdbfd47..ec512a5ce3a 100644
--- a/sys/dev/pv/hyperv.c
+++ b/sys/dev/pv/hyperv.c
@@ -79,7 +79,6 @@ struct hv_softc *hv_sc;
 
 int 	hv_match(struct device *, void *, void *);
 void	hv_attach(struct device *, struct device *, void *);
-void	hv_deferred(void *);
 void	hv_set_version(struct hv_softc *);
 u_int	hv_gettime(struct timecounter *);
 int	hv_init_hypercall(struct hv_softc *);
@@ -318,16 +317,8 @@ hv_attach(struct device *parent, struct device *self, void *aux)
 	/* Attach heartbeat, KVP and other "internal" services */
 	hv_attach_icdevs(sc);
 
-	startuphook_establish(hv_deferred, sc);
-}
-
-void
-hv_deferred(void *arg)
-{
-	struct hv_softc *sc = arg;
-
-	if (hv_attach_devices(sc))
-		return;
+	/* Attach devices with external drivers */
+	hv_attach_devices(sc);
 }
 
 void