Backout the rename, it was more confusing then helpful.

1 files changed, 9 insertions, 9 deletions

diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index eed28cd3327..a611b4a0c65 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmouse.c,v 1.63 2020/03/24 08:11:59 anton Exp $ */
+/* $OpenBSD: wsmouse.c,v 1.64 2020/03/24 12:34:14 anton Exp $ */
 /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -151,9 +151,9 @@ int	wsmouse_mux_open(struct wsevsrc *, struct wseventvar *);
 int	wsmouse_mux_close(struct wsevsrc *);
 #endif
 
-int	wmouse_do_ioctl(struct device *, u_long, caddr_t, int,
+int	wsmousedoioctl(struct device *, u_long, caddr_t, int,
 			    struct proc *);
-int	wsmouse_do_open(struct wsmouse_softc *, struct wseventvar *);
+int	wsmousedoopen(struct wsmouse_softc *, struct wseventvar *);
 
 struct cfdriver wsmouse_cd = {
 	NULL, "wsmouse", DV_TTY
@@ -169,7 +169,7 @@ struct wssrcops wsmouse_srcops = {
 	.type		= WSMUX_MOUSE,
 	.dopen		= wsmouse_mux_open,
 	.dclose		= wsmouse_mux_close,
-	.dioctl		= wmouse_do_ioctl,
+	.dioctl		= wsmousedoioctl,
 	.ddispioctl	= NULL,
 	.dsetdisplay	= NULL,
 };
@@ -331,7 +331,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
 	if (wsevent_init(evar))
 		return (EBUSY);
 
-	error = wsmouse_do_open(sc, evar);
+	error = wsmousedoopen(sc, evar);
 	if (error)
 		wsevent_fini(evar);
 	return (error);
@@ -371,7 +371,7 @@ wsmouseclose(dev_t dev, int flags, int mode, struct proc *p)
 }
 
 int
-wsmouse_do_open(struct wsmouse_softc *sc, struct wseventvar *evp)
+wsmousedoopen(struct wsmouse_softc *sc, struct wseventvar *evp)
 {
 	int error;
 
@@ -417,13 +417,13 @@ wsmouseread(dev_t dev, struct uio *uio, int flags)
 int
 wsmouseioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
-	return (wmouse_do_ioctl(wsmouse_cd.cd_devs[minor(dev)],
+	return (wsmousedoioctl(wsmouse_cd.cd_devs[minor(dev)],
 	    cmd, data, flag, p));
 }
 
 /* A wrapper around the ioctl() workhorse to make reference counting easy. */
 int
-wmouse_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
+wsmousedoioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
     struct proc *p)
 {
 	struct wsmouse_softc *sc = (struct wsmouse_softc *)dv;
@@ -560,7 +560,7 @@ wsmouse_mux_open(struct wsevsrc *me, struct wseventvar *evp)
 {
 	struct wsmouse_softc *sc = (struct wsmouse_softc *)me;
 
-	return (wsmouse_do_open(sc, evp));
+	return (wsmousedoopen(sc, evp));
 }
 
 int