4 files changed, 9 insertions, 12 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index f71ae4b0a6e7..29ab7e3076e8 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -3054,8 +3054,8 @@ retrier(struct fdc_data *fdc)
 	default:
 	fail:
 		if ((fd->options & FDOPT_NOERRLOG) == 0) {
-			diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE,
-				(struct disklabel *)NULL);
+			disk_err(bp, "hard error",
+			    fdc->fd->skip / DEV_BSIZE, 0);
 			if (fdc->flags & FDC_STAT_VALID) {
 				printf(
 				" (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n",
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 51228dc61a33..02ea80411d30 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -250,9 +250,8 @@ reread_mbr:
 #endif
 	DEV_STRATEGY(bp, 1);
 	if (bufwait(bp) != 0) {
-		diskerr(&bp->b_io, "reading primary partition table: error",
-		    0, (struct disklabel *)NULL);
-		printf("\n");
+		disk_err(&bp->b_io, "reading primary partition table: error",
+		    0, 1);
 		error = EIO;
 		goto done;
 	}
@@ -533,9 +532,8 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
 	bp->b_iocmd = BIO_READ;
 	DEV_STRATEGY(bp, 1);
 	if (bufwait(bp) != 0) {
-		diskerr(&bp->b_io, "reading extended partition table: error",
-		    0, (struct disklabel *)NULL);
-		printf("\n");
+		disk_err(&bp->b_io, "reading extended partition table: error",
+		    0, 1);
 		goto done;
 	}
 
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index f71ae4b0a6e7..29ab7e3076e8 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -3054,8 +3054,8 @@ retrier(struct fdc_data *fdc)
 	default:
 	fail:
 		if ((fd->options & FDOPT_NOERRLOG) == 0) {
-			diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE,
-				(struct disklabel *)NULL);
+			disk_err(bp, "hard error",
+			    fdc->fd->skip / DEV_BSIZE, 0);
 			if (fdc->flags & FDC_STAT_VALID) {
 				printf(
 				" (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n",
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 1ed9f1b54829..9c83b569a529 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -1874,8 +1874,7 @@ wderror(struct bio *bp, struct softc *du, char *mesg)
 	if (bp == NULL)
 		printf("wd%d: %s", du->dk_lunit, mesg);
 	else
-		diskerr(bp, mesg, du->dk_skip,
-			dsgetlabel(bp->bio_dev, du->dk_slices));
+		disk_err(bp, mesg, du->dk_skip, 0);
 	printf(" (status %b error %b)\n",
 	       du->dk_status, WDCS_BITS, du->dk_error, WDERR_BITS);
 }