From 89c9c53da05197f657dfe8e0bdda6941a2e9a0d4 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 16 Jun 2004 09:47:26 +0000 Subject: Do the dreaded s/dev_t/struct cdev */ Bump __FreeBSD_version accordingly. --- sys/dev/mly/mly.c | 6 +++--- sys/dev/mly/mlyvar.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/dev/mly') diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c index eb035d00979bd..2e368164b6045 100644 --- a/sys/dev/mly/mly.c +++ b/sys/dev/mly/mly.c @@ -2826,7 +2826,7 @@ mly_print_controller(int controller) * Accept an open operation on the control device. */ static int -mly_user_open(dev_t dev, int flags, int fmt, struct thread *td) +mly_user_open(struct cdev *dev, int flags, int fmt, struct thread *td) { int unit = minor(dev); struct mly_softc *sc = devclass_get_softc(devclass_find("mly"), unit); @@ -2839,7 +2839,7 @@ mly_user_open(dev_t dev, int flags, int fmt, struct thread *td) * Accept the last close on the control device. */ static int -mly_user_close(dev_t dev, int flags, int fmt, struct thread *td) +mly_user_close(struct cdev *dev, int flags, int fmt, struct thread *td) { int unit = minor(dev); struct mly_softc *sc = devclass_get_softc(devclass_find("mly"), unit); @@ -2852,7 +2852,7 @@ mly_user_close(dev_t dev, int flags, int fmt, struct thread *td) * Handle controller-specific control operations. */ static int -mly_user_ioctl(dev_t dev, u_long cmd, caddr_t addr, +mly_user_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, struct thread *td) { struct mly_softc *sc = (struct mly_softc *)dev->si_drv1; diff --git a/sys/dev/mly/mlyvar.h b/sys/dev/mly/mlyvar.h index c994d429233a5..e1c7a50e91679 100644 --- a/sys/dev/mly/mlyvar.h +++ b/sys/dev/mly/mlyvar.h @@ -165,7 +165,7 @@ struct mly_command { struct mly_softc { /* bus connections */ device_t mly_dev; - dev_t mly_dev_t; + struct cdev *mly_dev_t; struct resource *mly_regs_resource; /* register interface window */ int mly_regs_rid; /* resource ID */ bus_space_handle_t mly_bhandle; /* bus space handle */ -- cgit v1.3