Use device_get_nameunit(dev) as the mutex string when calling

mtx_init() instead of hard-coded string constant. Also remember to do
the mutex changes to the ste driver, which I forgot in the first commit.

5 files changed, 5 insertions, 5 deletions

diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index f7c97a1..38475ab 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -1699,7 +1699,7 @@ static int dc_attach(dev)
 		goto fail;
 	}
 
-	mtx_init(&sc->dc_mtx, "dc", MTX_DEF);
+	mtx_init(&sc->dc_mtx, device_get_nameunit(dev), MTX_DEF);
 	DC_LOCK(sc);
 	/* Need this info to decide on a chip type. */
 	sc->dc_info = dc_devtype(dev);
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index a7d14522..eac7980 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -766,7 +766,7 @@ static int sf_attach(dev)
 	}
 
 	callout_handle_init(&sc->sf_stat_ch);
-	mtx_init(&sc->sf_mtx, "sf", MTX_DEF);
+	mtx_init(&sc->sf_mtx, device_get_nameunit(dev), MTX_DEF);
 	SF_LOCK(sc);
 	/* Reset the adapter. */
 	sf_reset(sc);
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 963f754..b1f0bfd 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -1277,7 +1277,7 @@ static int sk_attach(dev)
 		goto fail;
 	}
 
-	mtx_init(&sc->sk_mtx, "skc", MTX_DEF);
+	mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_DEF);
 	SK_LOCK(sc);
 	/* Reset the adapter. */
 	sk_reset(sc);
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 04ec29d..1afd6ed 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -1537,7 +1537,7 @@ static int ti_attach(dev)
 		goto fail;
 	}
 
-	mtx_init(&sc->ti_mtx, "ti", MTX_DEF);
+	mtx_init(&sc->ti_mtx, device_get_nameunit(dev), MTX_DEF);
 	TI_LOCK(sc);
 
 	sc->ti_unit = unit;
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 10b9942..7430a8c 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -729,7 +729,7 @@ static int vr_attach(dev)
 		goto fail;
 	}
 
-	mtx_init(&sc->vr_mtx, "vr", MTX_DEF);
+	mtx_init(&sc->vr_mtx, device_get_nameunit(dev), MTX_DEF);
 	VR_LOCK(sc);
 	/* Reset the adapter. */
 	vr_reset(sc);