From 94c1107c499b1873690aebb32600a983a86722e4 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Wed, 3 Feb 2016 15:16:20 +0000 Subject: MFC r293825: Switch legacy pty clone handler to use make_dev_s(9). MFC r294594: Remove printf only useful for debugging. Approved by: re (marius) --- sys/dev/pty/pty.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/dev/pty/pty.c b/sys/dev/pty/pty.c index 5e2d822fe291..e38ed69243c5 100644 --- a/sys/dev/pty/pty.c +++ b/sys/dev/pty/pty.c @@ -97,6 +97,8 @@ static void pty_clone(void *arg, struct ucred *cr, char *name, int namelen, struct cdev **dev) { + struct make_dev_args mda; + int error; /* Cloning is already satisfied. */ if (*dev != NULL) @@ -117,8 +119,15 @@ pty_clone(void *arg, struct ucred *cr, char *name, int namelen, return; /* Create the controller device node. */ - *dev = make_dev_credf(MAKEDEV_REF, &ptydev_cdevsw, 0, - NULL, UID_ROOT, GID_WHEEL, 0666, "%s", name); + make_dev_args_init(&mda); + mda.mda_flags = MAKEDEV_CHECKNAME | MAKEDEV_REF; + mda.mda_devsw = &ptydev_cdevsw; + mda.mda_uid = UID_ROOT; + mda.mda_gid = GID_WHEEL; + mda.mda_mode = 0666; + error = make_dev_s(&mda, dev, "%s", name); + if (error != 0) + *dev = NULL; } static int -- cgit v1.3