We don't need to pass the diskname argument all over the diskslice/label

code, we can find the name from any convenient dev_t

4 files changed, 17 insertions, 17 deletions

diff --git a/sys/pc98/pc98/atcompat_diskslice.c b/sys/pc98/pc98/atcompat_diskslice.c
index ee18554..2bd03d0 100644
--- a/sys/pc98/pc98/atcompat_diskslice.c
+++ b/sys/pc98/pc98/atcompat_diskslice.c
@@ -203,7 +203,7 @@ reread_mbr:
 
 	/* Weakly verify it. */
 	cp = bp->b_data;
-	sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
+	sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
 		       partname);
 	if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
 		if (bootverbose)
@@ -275,7 +275,7 @@ reread_mbr:
 		if (dp->dp_scyl == 0 && dp->dp_shd == 0 && dp->dp_ssect == 0
 		    && dp->dp_start == 0 && dp->dp_size == 0)
 			continue;
-		sname = dsname(dname, dkunit(dev), BASE_SLICE + dospart,
+		sname = dsname(dev, dkunit(dev), BASE_SLICE + dospart,
 			       RAW_PART, partname);
 
 		/*
@@ -397,7 +397,7 @@ atcompat_extended(dname, dev, lp, ssp, ext_offset, ext_size, base_ext_offset,
 	/* Weakly verify it. */
 	cp = bp->b_data;
 	if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
-		sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
+		sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
 			       partname);
 		if (bootverbose)
 			printf("%s: invalid extended partition table: no magic\n",
@@ -417,7 +417,7 @@ atcompat_extended(dname, dev, lp, ssp, ext_offset, ext_size, base_ext_offset,
                     dp->dp_typ == DOSPTYP_EXTENDEDX) {
 			char buf[32];
 
-			sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE,
+			sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE,
 				       RAW_PART, partname);
 			snprintf(buf, sizeof(buf), "%s", sname);
 			if (strlen(buf) < sizeof buf - 11)
@@ -427,7 +427,7 @@ atcompat_extended(dname, dev, lp, ssp, ext_offset, ext_size, base_ext_offset,
 			ext_offsets[dospart] = base_ext_offset + dp->dp_start;
 			ext_sizes[dospart] = dp->dp_size;
 		} else {
-			sname = dsname(dname, dkunit(dev), slice, RAW_PART,
+			sname = dsname(dev, dkunit(dev), slice, RAW_PART,
 				       partname);
 			check_part(sname, dp, ext_offset, nsectors, ntracks,
 				   mbr_offset);
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 1bc1e76..12038c0 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -257,7 +257,7 @@ reread_mbr:
 
 	/* Weakly verify it. */
 	cp = bp->b_data;
-	sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
+	sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
 		       partname);
 	if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
 		if (bootverbose)
@@ -272,7 +272,7 @@ reread_mbr:
 	 */
 	if ((*(cp + 512) == 0x57) && (*(cp + 513) == 0x45) &&
 		(*(cp + 514) == 0x56) && (*(cp + 515) == 0x82)) {
-		sname = dsname(dname, dkunit(dev), BASE_SLICE,
+		sname = dsname(dev, dkunit(dev), BASE_SLICE,
 			RAW_PART, partname);
 		free(*sspp, M_DEVBUF);
 		ssp = dsmakeslicestruct(MAX_SLICES, lp);
@@ -296,7 +296,7 @@ reread_mbr:
 	    (*(cp + 0x1c) == 0x0) && 
 		((*(cp + 512) == 0xf0) || (*(cp + 512) == 0xf8)) &&
 	    (*(cp + 513) == 0xff) && (*(cp + 514) == 0xff)) {
-		sname = dsname(dname, dkunit(dev), BASE_SLICE,
+		sname = dsname(dev, dkunit(dev), BASE_SLICE,
 			RAW_PART, partname);
 		free(*sspp, M_DEVBUF);
 		ssp = dsmakeslicestruct(MAX_SLICES, lp);
@@ -405,14 +405,14 @@ reread_mbr:
 	for (dospart = 0, dp = dp0; dospart < NDOSPART; dospart++, dp++) {
 		if (dp->dp_scyl == 0 && dp->dp_shd == 0 && dp->dp_ssect == 0)
 			continue;
-		sname = dsname(dname, dkunit(dev), BASE_SLICE + dospart,
+		sname = dsname(dev, dkunit(dev), BASE_SLICE + dospart,
 				RAW_PART, partname);
 #else
 	for (dospart = 0, dp = dp0; dospart < NDOSPART; dospart++, dp++) {
 		if (dp->dp_scyl == 0 && dp->dp_shd == 0 && dp->dp_ssect == 0
 		    && dp->dp_start == 0 && dp->dp_size == 0)
 			continue;
-		sname = dsname(dname, dkunit(dev), BASE_SLICE + dospart,
+		sname = dsname(dev, dkunit(dev), BASE_SLICE + dospart,
 			       RAW_PART, partname);
 #endif
 		/*
@@ -546,7 +546,7 @@ extended(dname, dev, lp, ssp, ext_offset, ext_size, base_ext_offset,
 	/* Weakly verify it. */
 	cp = bp->b_data;
 	if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
-		sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
+		sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
 			       partname);
 		if (bootverbose)
 			printf("%s: invalid extended partition table: no magic\n",
@@ -574,7 +574,7 @@ extended(dname, dev, lp, ssp, ext_offset, ext_size, base_ext_offset,
 #endif
 			char buf[32];
 
-			sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE,
+			sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE,
 				       RAW_PART, partname);
 			snprintf(buf, sizeof(buf), "%s", sname);
 			if (strlen(buf) < sizeof buf - 11)
@@ -591,7 +591,7 @@ extended(dname, dev, lp, ssp, ext_offset, ext_size, base_ext_offset,
 			ext_sizes[dospart] = dp->dp_size;
 #endif
 		} else {
-			sname = dsname(dname, dkunit(dev), slice, RAW_PART,
+			sname = dsname(dev, dkunit(dev), slice, RAW_PART,
 				       partname);
 			check_part(sname, dp, ext_offset, nsectors, ntracks,
 				   mbr_offset);
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 4f118d0..f651bb6 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -1359,7 +1359,7 @@ wdopen(dev_t dev, int flags, int fmt, struct proc *p)
 	label.d_ncylinders = du->dk_dd.d_ncylinders;
 	label.d_secpercyl = du->dk_dd.d_secpercyl;
 	label.d_secperunit = du->dk_dd.d_secperunit;
-	error = dsopen("wd", dev, fmt, 0, &du->dk_slices, &label);
+	error = dsopen(dev, fmt, 0, &du->dk_slices, &label);
 	}
 	du->dk_flags &= ~DKFL_LABELLING;
 	wdsleep(du->dk_ctrlr, "wdopn2");
@@ -2099,7 +2099,7 @@ wdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 
 	du = wddrives[lunit];
 	wdsleep(du->dk_ctrlr, "wdioct");
-	error = dsioctl("wd", dev, cmd, addr, flags, &du->dk_slices);
+	error = dsioctl(dev, cmd, addr, flags, &du->dk_slices);
 	if (error != ENOIOCTL)
 		return (error);
 #ifdef PC98
diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c
index f7837d7..3a169ac 100644
--- a/sys/pc98/pc98/wfd.c
+++ b/sys/pc98/pc98/wfd.c
@@ -374,7 +374,7 @@ int wfdopen (dev_t dev, int flags, int fmt, struct proc *p)
 	label.d_secperunit = label.d_secpercyl * t->cap.cyls;
 
 	/* Initialize slice tables. */
-	errcode = dsopen("wfd", dev, fmt, 0, &t->dk_slices, &label);
+	errcode = dsopen(dev, fmt, 0, &t->dk_slices, &label);
 	if (errcode != 0)
 		return errcode;
 
@@ -627,7 +627,7 @@ int wfdioctl (dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 	struct wfd *t = wfdtab[lun];
 	int error = 0;
 
-	error = dsioctl("wfd", dev, cmd, addr, flag, &t->dk_slices);
+	error = dsioctl(dev, cmd, addr, flag, &t->dk_slices);
 	if (error != ENOIOCTL)
 		return (error);