From 9c72381e09a5593df856423c995563779f7535e8 Mon Sep 17 00:00:00 2001 From: phk Date: Sat, 28 Aug 1999 14:33:44 +0000 Subject: 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 --- sys/cam/scsi/scsi_cd.c | 4 ++-- sys/cam/scsi/scsi_da.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/cam') diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index a6d4ac8..5e9d1d2 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -956,7 +956,7 @@ cdopen(dev_t dev, int flags, int fmt, struct proc *p) label.d_partitions[0].p_fstype = FS_OTHER; /* Initialize slice tables. */ - error = dsopen("cd", dev, fmt, DSO_NOLABELS | DSO_ONESLICE, + error = dsopen(dev, fmt, DSO_NOLABELS | DSO_ONESLICE, &softc->cd_slices, &label); if (error == 0) { @@ -2452,7 +2452,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) * Check to see whether we've got a disk-type ioctl. If we * don't, dsioctl will pass back an error code of ENOIOCTL. */ - error = dsioctl("cd", dev, cmd, addr, flag, &softc->cd_slices); + error = dsioctl(dev, cmd, addr, flag, &softc->cd_slices); if (error != ENOIOCTL) break; diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index bcd752d..aa2ff80 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -380,7 +380,7 @@ daopen(dev_t dev, int flags, int fmt, struct proc *p) } /* Initialize slice tables. */ - error = dsopen("da", dev, fmt, 0, &softc->dk_slices, &label); + error = dsopen(dev, fmt, 0, &softc->dk_slices, &label); /* * Check to see whether or not the blocksize is set yet. @@ -599,7 +599,7 @@ daioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) return (error); /* error code from tsleep */ } - error = dsioctl("da", dev, cmd, addr, flag, &softc->dk_slices); + error = dsioctl(dev, cmd, addr, flag, &softc->dk_slices); if (error == ENOIOCTL) error = cam_periph_ioctl(periph, cmd, addr, daerror); -- cgit v1.1