2 files changed, 15 insertions, 15 deletions

diff --git a/sys/dev/usb/ubser.c b/sys/dev/usb/ubser.c
index 59ad8d5a6f689..f64fd0e3eb24f 100644
--- a/sys/dev/usb/ubser.c
+++ b/sys/dev/usb/ubser.c
@@ -440,7 +440,7 @@ bad:
 			tp = sc->dev[i]->si_tty;
 			if (tp != NULL) {
 				if (tp->t_state & TS_ISOPEN) {
-					(*linesw[tp->t_line].l_close)(tp, 0);
+					ttyld_close(tp, 0);
 					ttyclose(tp);
 				}
 			}
@@ -474,7 +474,7 @@ USB_DETACH(ubser)
 			tp = sc->dev[i]->si_tty;
 			if (tp != NULL) {
 				if (tp->t_state & TS_ISOPEN) {
-					(*linesw[tp->t_line].l_close)(tp, 0);
+					ttyld_close(tp, 0);
 					ttyclose(tp);
 				}
 			}
@@ -694,7 +694,7 @@ ubserwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
 		CLR(tp->t_state, TS_FLUSH);
 	else
 		ndflush(&tp->t_outq, cc);
-	(*linesw[tp->t_line].l_start)(tp);
+	ttyld_start(tp);
 	splx(s);
 
 	return;
@@ -900,7 +900,7 @@ ubser_open(dev_t dev, int flag, int mode, usb_proc_ptr p)
 		/*
 		 * Handle initial DCD.
 		 */
-		(*linesw[tp->t_line].l_modem)(tp, 1);
+		ttyld_modem(tp, 1);
 	}
 
 	sc->sc_refcnt++;	/* XXX: wrong refcnt on error later on */
@@ -912,7 +912,7 @@ ubser_open(dev_t dev, int flag, int mode, usb_proc_ptr p)
 	if (error)
 		goto bad;
 
-	error = (*linesw[tp->t_line].l_open)(dev, tp);
+	error = ttyld_open(tp, dev);
 	if (error)
 		goto bad;
 
@@ -1013,7 +1013,7 @@ ubser_read(dev_t dev, struct uio *uio, int flag)
 	if (sc->sc_dying)
 		return (EIO);
 
-	error = (*linesw[tp->t_line].l_read)(tp, uio, flag);
+	error = ttyld_read(tp, uio, flag);
 
 	DPRINTF(("ubser_read: error = %d\n", error));
 
@@ -1035,7 +1035,7 @@ ubser_write(dev_t dev, struct uio *uio, int flag)
 	if (sc->sc_dying)
 		return (EIO);
 
-	error = (*linesw[tp->t_line].l_write)(tp, uio, flag);
+	error = ttyld_write(tp, uio, flag);
 
 	DPRINTF(("ubser_write: error = %d\n", error));
 
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index e3cf7b6366de2..07d4496c32a5a 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -213,7 +213,7 @@ ucom_detach(struct ucom_softc *sc)
 		if (tp->t_state & TS_ISOPEN) {
 			device_printf(sc->sc_dev,
 				      "still open, forcing close\n");
-			(*linesw[tp->t_line].l_close)(tp, 0);
+			ttyld_close(tp, 0);
 			ttyclose(tp);
 		}
 	} else {
@@ -385,7 +385,7 @@ ucomopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 		 */
 		if (ISSET(sc->sc_msr, UMSR_DCD) ||
 		    (minor(dev) & UCOM_CALLOUT_MASK))
-			(*linesw[tp->t_line].l_modem)(tp, 1);
+			ttyld_modem(tp, 1);
 
 		ucomstartread(sc);
 	}
@@ -398,7 +398,7 @@ ucomopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 	if (error)
 		goto bad;
 
-	error = (*linesw[tp->t_line].l_open)(dev, tp);
+	error = ttyld_open(tp, dev);
 	if (error)
 		goto bad;
 
@@ -461,7 +461,7 @@ ucomclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
 		goto quit;
 
 	s = spltty();
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	ttyld_close(tp, flag);
 	disc_optim(tp, &tp->t_termios, sc);
 	ttyclose(tp);
 	splx(s);
@@ -503,7 +503,7 @@ ucomread(dev_t dev, struct uio *uio, int flag)
 	if (sc->sc_dying)
 		return (EIO);
 
-	error = (*linesw[tp->t_line].l_read)(tp, uio, flag);
+	error = ttyld_read(tp, uio, flag);
 
 	DPRINTF(("ucomread: error = %d\n", error));
 
@@ -525,7 +525,7 @@ ucomwrite(dev_t dev, struct uio *uio, int flag)
 	if (sc->sc_dying)
 		return (EIO);
 
-	error = (*linesw[tp->t_line].l_write)(tp, uio, flag);
+	error = ttyld_write(tp, uio, flag);
 
 	DPRINTF(("ucomwrite: error = %d\n", error));
 
@@ -762,7 +762,7 @@ ucom_status_change(struct ucom_softc *sc)
 			return;
 		onoff = ISSET(sc->sc_msr, UMSR_DCD) ? 1 : 0;
 		DPRINTF(("ucom_status_change: DCD changed to %d\n", onoff));
-		(*linesw[tp->t_line].l_modem)(tp, onoff);
+		ttyld_modem(tp, onoff);
 	}
 }
 
@@ -993,7 +993,7 @@ ucomwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
 		CLR(tp->t_state, TS_FLUSH);
 	else
 		ndflush(&tp->t_outq, cc);
-	(*linesw[tp->t_line].l_start)(tp);
+	ttyld_start(tp);
 	splx(s);
 
 	return;