Removed diskerr()'s unused d_name arg and updated callers. This fixes

warnings caused by the arg having the wrong type (not const enough).
The arg was also wrong (a full name instead of a short one) for calls
from from subr_diskmbr.c and pc98/diskslice_machdep.c.

10 files changed, 14 insertions, 17 deletions

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 7e6b0b3..4075bf4 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -2083,7 +2083,7 @@ retrier(struct fdc_data *fdc)
 			/* Trick diskerr */
 			bp->b_dev = makedev(major(bp->b_dev),
 				    (FDUNIT(minor(bp->b_dev))<<3)|RAW_PART);
-			diskerr(bp, "fd", "hard error", LOG_PRINTF,
+			diskerr(bp, "hard error", LOG_PRINTF,
 				fdc->fd->skip / DEV_BSIZE,
 				(struct disklabel *)NULL);
 			bp->b_dev = sav_b_dev;
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 3ced09e..76a9755 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -2090,7 +2090,7 @@ wderror(struct buf *bp, struct disk *du, char *mesg)
 	if (bp == NULL)
 		printf("wd%d: %s", du->dk_lunit, mesg);
 	else
-		diskerr(bp, "wd", mesg, LOG_PRINTF, du->dk_skip,
+		diskerr(bp, mesg, LOG_PRINTF, du->dk_skip,
 			dsgetlabel(bp->b_dev, du->dk_slices));
 	printf(" (status %b error %b)\n",
 	       du->dk_status, WDCS_BITS, du->dk_error, WDERR_BITS);
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 7e6b0b3..4075bf4 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -2083,7 +2083,7 @@ retrier(struct fdc_data *fdc)
 			/* Trick diskerr */
 			bp->b_dev = makedev(major(bp->b_dev),
 				    (FDUNIT(minor(bp->b_dev))<<3)|RAW_PART);
-			diskerr(bp, "fd", "hard error", LOG_PRINTF,
+			diskerr(bp, "hard error", LOG_PRINTF,
 				fdc->fd->skip / DEV_BSIZE,
 				(struct disklabel *)NULL);
 			bp->b_dev = sav_b_dev;
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index e3a734c..9184f2f 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -354,9 +354,9 @@ hp0g: hard error reading fsbn 12345 of 12344-12347 (hp0 bn %d cn %d tn %d sn %d)
  * or addlog, respectively.  There is no trailing space.
  */
 void
-diskerr(bp, dname, what, pri, blkdone, lp)
+diskerr(bp, what, pri, blkdone, lp)
 	register struct buf *bp;
-	char *dname, *what;
+	char *what;
 	int pri, blkdone;
 	register struct disklabel *lp;
 {
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 5b5351e..34519b4 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -186,8 +186,7 @@ reread_mbr:
 	bp->b_flags |= B_READ;
 	BUF_STRATEGY(bp, 1);
 	if (biowait(bp) != 0) {
-		diskerr(bp, devtoname(bp->b_dev),
-		    "error reading primary partition table",
+		diskerr(bp, "error reading primary partition table",
 		    LOG_PRINTF, 0, (struct disklabel *)NULL);
 		printf("\n");
 		error = EIO;
@@ -385,8 +384,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
 	bp->b_flags |= B_READ;
 	BUF_STRATEGY(bp, 1);
 	if (biowait(bp) != 0) {
-		diskerr(bp, devtoname(bp->b_dev),
-		    "error reading extended partition table",
+		diskerr(bp, "error reading extended partition table",
 		    LOG_PRINTF, 0, (struct disklabel *)NULL);
 		printf("\n");
 		goto done;
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 6cac865..a3431ef 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -2532,7 +2532,7 @@ retrier(struct fdc_data *fdc)
 			/* Trick diskerr */
 			bp->b_dev = makedev(major(bp->b_dev),
 				    (FDUNIT(minor(bp->b_dev))<<3)|RAW_PART);
-			diskerr(bp, "fd", "hard error", LOG_PRINTF,
+			diskerr(bp, "hard error", LOG_PRINTF,
 				fdc->fd->skip / DEV_BSIZE,
 				(struct disklabel *)NULL);
 			bp->b_dev = sav_b_dev;
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 6c0b2f2..9e88e29 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -247,8 +247,7 @@ reread_mbr:
 #endif
 	BUF_STRATEGY(bp, 1);
 	if (biowait(bp) != 0) {
-		diskerr(bp, devtoname(bp->b_dev), 
-		    "error reading primary partition table",
+		diskerr(bp, "error reading primary partition table",
 		    LOG_PRINTF, 0, (struct disklabel *)NULL);
 		printf("\n");
 		error = EIO;
@@ -538,7 +537,7 @@ extended(dname, dev, lp, ssp, ext_offset, ext_size, base_ext_offset,
 	bp->b_flags |= B_READ;
 	BUF_STRATEGY(bp, 1);
 	if (biowait(bp) != 0) {
-		diskerr(bp, dname, "error reading extended partition table",
+		diskerr(bp, "error reading extended partition table",
 		    LOG_PRINTF, 0, (struct disklabel *)NULL);
 		printf("\n");
 		goto done;
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 6cac865..a3431ef 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -2532,7 +2532,7 @@ retrier(struct fdc_data *fdc)
 			/* Trick diskerr */
 			bp->b_dev = makedev(major(bp->b_dev),
 				    (FDUNIT(minor(bp->b_dev))<<3)|RAW_PART);
-			diskerr(bp, "fd", "hard error", LOG_PRINTF,
+			diskerr(bp, "hard error", LOG_PRINTF,
 				fdc->fd->skip / DEV_BSIZE,
 				(struct disklabel *)NULL);
 			bp->b_dev = sav_b_dev;
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index d29f92d..4404e9c 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -2327,7 +2327,7 @@ wderror(struct buf *bp, struct disk *du, char *mesg)
 	if (bp == NULL)
 		printf("wd%d: %s", du->dk_lunit, mesg);
 	else
-		diskerr(bp, "wd", mesg, LOG_PRINTF, du->dk_skip,
+		diskerr(bp, mesg, LOG_PRINTF, du->dk_skip,
 			dsgetlabel(bp->b_dev, du->dk_slices));
 	printf(" (status %b error %b)\n",
 	       du->dk_status, WDCS_BITS, du->dk_error, WDERR_BITS);
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index e3a734c..9184f2f 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -354,9 +354,9 @@ hp0g: hard error reading fsbn 12345 of 12344-12347 (hp0 bn %d cn %d tn %d sn %d)
  * or addlog, respectively.  There is no trailing space.
  */
 void
-diskerr(bp, dname, what, pri, blkdone, lp)
+diskerr(bp, what, pri, blkdone, lp)
 	register struct buf *bp;
-	char *dname, *what;
+	char *what;
 	int pri, blkdone;
 	register struct disklabel *lp;
 {