diff options
| author | phk <phk@FreeBSD.org> | 2003-03-02 14:30:54 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-03-02 14:30:54 +0000 |
| commit | 3dee40a992d6f8ab4b3b349ea3d2781d756273c4 (patch) | |
| tree | 719eed1a7756061e57c652def05ea1acc2253f61 /sys/dev/mcd | |
| parent | 4ad4dab84a5c41ab4e85053d6d18796fedc30f87 (diff) | |
| download | FreeBSD-src-3dee40a992d6f8ab4b3b349ea3d2781d756273c4.zip FreeBSD-src-3dee40a992d6f8ab4b3b349ea3d2781d756273c4.tar.gz | |
NO_GEOM cleanup:
mcdsize() is not a cdevsw->d_psize function (any more ?) so rename it,
give it a better prototype to avoid misusing d_psize_t.
Diffstat (limited to 'sys/dev/mcd')
| -rw-r--r-- | sys/dev/mcd/mcd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index b117cf7..73197bd 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -151,11 +151,11 @@ static int mcd_pause(struct mcd_softc *); static int mcd_resume(struct mcd_softc *); static int mcd_lock_door(struct mcd_softc *, int lock); static int mcd_close_tray(struct mcd_softc *); +static int mcd_size(dev_t dev); static d_open_t mcdopen; static d_close_t mcdclose; static d_ioctl_t mcdioctl; -static d_psize_t mcdsize; static d_strategy_t mcdstrategy; #define CDEV_MAJOR 29 @@ -257,7 +257,7 @@ mcdopen(dev_t dev, int flags, int fmt, struct thread *td) return (ENXIO); } - if (mcdsize(dev) < 0) { + if (mcd_size(dev) < 0) { device_printf(sc->dev, "failed to get disk size\n"); return (ENXIO); } @@ -437,7 +437,7 @@ MCD_TRACE("ioctl called 0x%lx\n", cmd); } if ( (sc->data.status & (MCDDOOROPEN|MCDDSKCHNG)) || !(sc->data.status & MCDDSKIN) - || mcdsize(dev) < 0 + || mcd_size(dev) < 0 ) return (ENXIO); sc->data.flags |= MCDVALID; @@ -486,7 +486,7 @@ MCD_TRACE("ioctl called 0x%lx\n", cmd); } static int -mcdsize(dev_t dev) +mcd_size(dev_t dev) { struct mcd_softc *sc; int size; |
