diff options
| -rw-r--r-- | sys/arch/luna88k/dev/siotty.c | 5 | ||||
| -rw-r--r-- | sys/arch/sh/dev/scif.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/cz.c | 7 |
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/arch/luna88k/dev/siotty.c b/sys/arch/luna88k/dev/siotty.c index 633127704ee..23af46e9e7f 100644 --- a/sys/arch/luna88k/dev/siotty.c +++ b/sys/arch/luna88k/dev/siotty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siotty.c,v 1.23 2019/02/25 11:29:30 jca Exp $ */ +/* $OpenBSD: siotty.c,v 1.24 2021/01/01 10:21:26 jan Exp $ */ /* $NetBSD: siotty.c,v 1.9 2002/03/17 19:40:43 atatat Exp $ */ /*- @@ -503,9 +503,6 @@ sioopen(dev_t dev, int flag, int mode, struct proc *p) splx(s); } - error = ttyopen(dev, tp, p); - if (error > 0) - return error; return (*linesw[tp->t_line].l_open)(dev, tp, p); } diff --git a/sys/arch/sh/dev/scif.c b/sys/arch/sh/dev/scif.c index 5cf0039201d..e7cb52db5c8 100644 --- a/sys/arch/sh/dev/scif.c +++ b/sys/arch/sh/dev/scif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scif.c,v 1.19 2018/02/19 08:59:52 mpi Exp $ */ +/* $OpenBSD: scif.c,v 1.20 2021/01/01 10:21:26 jan Exp $ */ /* $NetBSD: scif.c,v 1.47 2006/07/23 22:06:06 ad Exp $ */ /*- @@ -756,10 +756,6 @@ scifopen(dev_t dev, int flag, int mode, struct proc *p) splx(s); - error = ttyopen(dev, tp, p); - if (error) - goto bad; - error = (*linesw[tp->t_line].l_open)(dev, tp, p); if (error) goto bad; diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index c6ed06e600e..8642be135fc 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cz.c,v 1.24 2020/05/21 09:31:59 mpi Exp $ */ +/* $OpenBSD: cz.c,v 1.25 2021/01/01 10:21:26 jan Exp $ */ /* $NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $ */ /*- @@ -835,7 +835,6 @@ cz_wait_pci_doorbell(struct cz_softc *cz, char *wstring) #define CZTTYDIALOUT_MASK 0x80 -#define CZTTY_DIALOUT(dev) (minor((dev)) & CZTTYDIALOUT_MASK) #define CZTTY_CZ(sc) ((sc)->sc_parent) #define CZTTY_SOFTC(dev) cztty_getttysoftc(dev) @@ -1034,10 +1033,6 @@ czttyopen(dev_t dev, int flags, int mode, struct proc *p) splx(s); - error = ttyopen(CZTTY_DIALOUT(dev), tp, p); - if (error) - goto bad; - error = (*linesw[tp->t_line].l_open)(dev, tp, p); if (error) goto bad; |