diff options
author | cheloha <cheloha@cvs.openbsd.org> | 2019-07-19 00:17:17 +0000 |
---|---|---|
committer | cheloha <cheloha@cvs.openbsd.org> | 2019-07-19 00:17:17 +0000 |
commit | 7e767d21df9a5f231fea78edd311fb71a0d413bd (patch) | |
tree | e537a4b64538ed7f38b79503add35c4c26119ce4 /sys/dev | |
parent | 526af2363f8af511c220944eeba24247c60ec18b (diff) |
ttysleep(): drop unused timeout parameter
All callers sleep indefinitely.
With help from visa@.
ok visa@, ratchov@, kn@
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/fdt/imxuart.c | 6 | ||||
-rw-r--r-- | sys/dev/fdt/mvuart.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/com.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/cy.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/pluart.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/z8530tty.c | 4 | ||||
-rw-r--r-- | sys/dev/sbus/magma.c | 4 | ||||
-rw-r--r-- | sys/dev/sbus/spif.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/ucom.c | 4 |
9 files changed, 22 insertions, 22 deletions
diff --git a/sys/dev/fdt/imxuart.c b/sys/dev/fdt/imxuart.c index 1418c90af09..e2604bf5025 100644 --- a/sys/dev/fdt/imxuart.c +++ b/sys/dev/fdt/imxuart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imxuart.c,v 1.7 2019/06/15 14:15:12 kettenis Exp $ */ +/* $OpenBSD: imxuart.c,v 1.8 2019/07/19 00:17:15 cheloha Exp $ */ /* * Copyright (c) 2005 Dale Rahn <drahn@motorola.com> * @@ -301,7 +301,7 @@ imxuart_param(struct tty *tp, struct termios *t) while (ISSET(tp->t_state, TS_BUSY)) { ++sc->sc_halt; error = ttysleep(tp, &tp->t_outq, - TTOPRI | PCATCH, "imxuartprm", 0); + TTOPRI | PCATCH, "imxuartprm"); --sc->sc_halt; if (error) { imxuart_start(tp); @@ -598,7 +598,7 @@ imxuartopen(dev_t dev, int flag, int mode, struct proc *p) !ISSET(tp->t_state, TS_CARR_ON))) { SET(tp->t_state, TS_WOPEN); error = ttysleep(tp, &tp->t_rawq, - TTIPRI | PCATCH, ttopen, 0); + TTIPRI | PCATCH, ttopen); /* * If TS_WOPEN has been reset, that means the * cua device has been closed. We don't want diff --git a/sys/dev/fdt/mvuart.c b/sys/dev/fdt/mvuart.c index 0ce1afb78a1..3d0229a396a 100644 --- a/sys/dev/fdt/mvuart.c +++ b/sys/dev/fdt/mvuart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mvuart.c,v 1.1 2019/04/30 20:04:31 patrick Exp $ */ +/* $OpenBSD: mvuart.c,v 1.2 2019/07/19 00:17:15 cheloha Exp $ */ /* * Copyright (c) 2005 Dale Rahn <drahn@motorola.com> * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se> @@ -280,7 +280,7 @@ mvuart_param(struct tty *tp, struct termios *t) while (ISSET(tp->t_state, TS_BUSY)) { ++sc->sc_halt; error = ttysleep(tp, &tp->t_outq, - TTOPRI | PCATCH, "mvuartprm", 0); + TTOPRI | PCATCH, "mvuartprm"); --sc->sc_halt; if (error) { mvuart_start(tp); @@ -450,7 +450,7 @@ mvuartopen(dev_t dev, int flag, int mode, struct proc *p) !ISSET(tp->t_state, TS_CARR_ON))) { SET(tp->t_state, TS_WOPEN); error = ttysleep(tp, &tp->t_rawq, - TTIPRI | PCATCH, ttopen, 0); + TTIPRI | PCATCH, ttopen); /* * If TS_WOPEN has been reset, that means the * cua device has been closed. We don't want diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index df5aff315d8..a83c8f70976 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.169 2018/05/14 19:25:54 kettenis Exp $ */ +/* $OpenBSD: com.c,v 1.170 2019/07/19 00:17:15 cheloha Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -395,7 +395,7 @@ comopen(dev_t dev, int flag, int mode, struct proc *p) (!ISSET(tp->t_cflag, CLOCAL) && !ISSET(tp->t_state, TS_CARR_ON))) { SET(tp->t_state, TS_WOPEN); - error = ttysleep(tp, &tp->t_rawq, TTIPRI | PCATCH, ttopen, 0); + error = ttysleep(tp, &tp->t_rawq, TTIPRI | PCATCH, ttopen); /* * If TS_WOPEN has been reset, that means the cua device * has been closed. We don't want to fail in that case, @@ -821,7 +821,7 @@ comparam(struct tty *tp, struct termios *t) ++sc->sc_halt; error = ttysleep(tp, &tp->t_outq, - TTOPRI | PCATCH, "comprm", 0); + TTOPRI | PCATCH, "comprm"); --sc->sc_halt; if (error) { comstart(tp); diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c index 515fc23aaed..4ca50c214ba 100644 --- a/sys/dev/ic/cy.c +++ b/sys/dev/ic/cy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy.c,v 1.38 2018/02/19 08:59:52 mpi Exp $ */ +/* $OpenBSD: cy.c,v 1.39 2019/07/19 00:17:15 cheloha Exp $ */ /* * Copyright (c) 1996 Timo Rossi. * All rights reserved. @@ -372,7 +372,7 @@ cyopen(dev, flag, mode, p) !ISSET(tp->t_state, TS_CARR_ON)) { SET(tp->t_state, TS_WOPEN); error = ttysleep(tp, &tp->t_rawq, TTIPRI | PCATCH, - "cydcd", 0); + "cydcd"); if (error != 0) { splx(s); CLR(tp->t_state, TS_WOPEN); diff --git a/sys/dev/ic/pluart.c b/sys/dev/ic/pluart.c index 0f024c0ad34..d21f386374e 100644 --- a/sys/dev/ic/pluart.c +++ b/sys/dev/ic/pluart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pluart.c,v 1.2 2018/08/12 18:32:18 kettenis Exp $ */ +/* $OpenBSD: pluart.c,v 1.3 2019/07/19 00:17:15 cheloha Exp $ */ /* * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se> * Copyright (c) 2005 Dale Rahn <drahn@dalerahn.com> @@ -287,7 +287,7 @@ pluart_param(struct tty *tp, struct termios *t) while (ISSET(tp->t_state, TS_BUSY)) { ++sc->sc_halt; error = ttysleep(tp, &tp->t_outq, - TTOPRI | PCATCH, "pluartprm", 0); + TTOPRI | PCATCH, "pluartprm"); --sc->sc_halt; if (error) { pluart_start(tp); @@ -576,7 +576,7 @@ pluartopen(dev_t dev, int flag, int mode, struct proc *p) !ISSET(tp->t_state, TS_CARR_ON))) { SET(tp->t_state, TS_WOPEN); error = ttysleep(tp, &tp->t_rawq, - TTIPRI | PCATCH, ttopen, 0); + TTIPRI | PCATCH, ttopen); /* * If TS_WOPEN has been reset, that means the * cua device has been closed. We don't want diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c index 10fa788a885..5737c6ee076 100644 --- a/sys/dev/ic/z8530tty.c +++ b/sys/dev/ic/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.30 2018/02/19 08:59:52 mpi Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.31 2019/07/19 00:17:15 cheloha Exp $ */ /* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -630,7 +630,7 @@ zsopen(dev_t dev, int flags, int mode, struct proc *p) break; error = ttysleep(tp, (caddr_t)&tp->t_rawq, TTIPRI | PCATCH, - ttopen, 0); + ttopen); if (!ZSDIALOUT(dev) && cs->cs_cua && error == EINTR) { error = 0; diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c index 0ecd08fef15..e6c11252067 100644 --- a/sys/dev/sbus/magma.c +++ b/sys/dev/sbus/magma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: magma.c,v 1.28 2018/02/19 08:59:52 mpi Exp $ */ +/* $OpenBSD: magma.c,v 1.29 2019/07/19 00:17:15 cheloha Exp $ */ /*- * Copyright (c) 1998 Iain Hibbert @@ -904,7 +904,7 @@ mttyopen(dev_t dev, int flags, int mode, struct proc *p) int error; SET(tp->t_state, TS_WOPEN); - error = ttysleep(tp, &tp->t_rawq, TTIPRI | PCATCH, "mttydcd", 0); + error = ttysleep(tp, &tp->t_rawq, TTIPRI | PCATCH, "mttydcd"); if (error != 0) { splx(s); CLR(tp->t_state, TS_WOPEN); diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c index b6dd4317a27..19f128420d7 100644 --- a/sys/dev/sbus/spif.c +++ b/sys/dev/sbus/spif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spif.c,v 1.22 2018/12/27 11:09:17 claudio Exp $ */ +/* $OpenBSD: spif.c,v 1.23 2019/07/19 00:17:15 cheloha Exp $ */ /* * Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net) @@ -391,7 +391,7 @@ sttyopen(dev_t dev, int flags, int mode, struct proc *p) SET(tp->t_state, TS_WOPEN); error = ttysleep(tp, &tp->t_rawq, TTIPRI | PCATCH, - "sttycd", 0); + "sttycd"); if (error != 0) { splx(s); CLR(tp->t_state, TS_WOPEN); diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 4e6c9e87583..f3120e3d0d9 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.67 2018/02/19 08:59:52 mpi Exp $ */ +/* $OpenBSD: ucom.c,v 1.68 2019/07/19 00:17:15 cheloha Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -493,7 +493,7 @@ ucom_do_open(dev_t dev, int flag, int mode, struct proc *p) !ISSET(tp->t_state, TS_CARR_ON))) { SET(tp->t_state, TS_WOPEN); error = ttysleep(tp, &tp->t_rawq, - TTIPRI | PCATCH, ttopen, 0); + TTIPRI | PCATCH, ttopen); if (usbd_is_dying(sc->sc_uparent)) { splx(s); |