[src/trunk]: src/sys/dev/ic com(4): Nix quirky `integrate' macro.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6652e4e16fc5
branches:  trunk
changeset: 371724:6652e4e16fc5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Oct 03 20:15:50 2022 +0000

description:
com(4): Nix quirky `integrate' macro.

Just use `static inline' like everything else.

diffstat:

 sys/dev/ic/com.c |  21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diffs (71 lines):

diff -r bc4ddf135a48 -r 6652e4e16fc5 sys/dev/ic/com.c
--- a/sys/dev/ic/com.c  Mon Oct 03 19:59:21 2022 +0000
+++ b/sys/dev/ic/com.c  Mon Oct 03 20:15:50 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.377 2022/10/03 19:59:21 riastradh Exp $ */
+/* $NetBSD: com.c,v 1.378 2022/10/03 20:15:50 riastradh Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.377 2022/10/03 19:59:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.378 2022/10/03 20:15:50 riastradh Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -176,12 +176,11 @@
 void   comcnputc(dev_t, int);
 void   comcnpollc(dev_t, int);
 
-#define        integrate       static inline
 void   comsoft(void *);
-integrate void com_rxsoft(struct com_softc *, struct tty *);
-integrate void com_txsoft(struct com_softc *, struct tty *);
-integrate void com_stsoft(struct com_softc *, struct tty *);
-integrate void com_schedrx(struct com_softc *);
+static inline void com_rxsoft(struct com_softc *, struct tty *);
+static inline void com_txsoft(struct com_softc *, struct tty *);
+static inline void com_stsoft(struct com_softc *, struct tty *);
+static inline void com_schedrx(struct com_softc *);
 void   comdiag(void *);
 
 dev_type_open(comopen);
@@ -1389,7 +1388,7 @@
        return (error);
 }
 
-integrate void
+static inline void
 com_schedrx(struct com_softc *sc)
 {
 
@@ -2019,7 +2018,7 @@
            floods, floods == 1 ? "" : "s");
 }
 
-integrate void
+static inline void
 com_rxsoft(struct com_softc *sc, struct tty *tp)
 {
        int (*rint)(int, struct tty *) = tp->t_linesw->l_rint;
@@ -2123,7 +2122,7 @@
        }
 }
 
-integrate void
+static inline void
 com_txsoft(struct com_softc *sc, struct tty *tp)
 {
 
@@ -2135,7 +2134,7 @@
        (*tp->t_linesw->l_start)(tp);
 }
 
-integrate void
+static inline void
 com_stsoft(struct com_softc *sc, struct tty *tp)
 {
        u_char msr, delta;