diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-07-26 05:25:22 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-07-26 05:25:22 +0000 |
| commit | df9a0b4243cae6b9c7dff4b4874110bd7539b0ab (patch) | |
| tree | 8eaf70f91c063e99a7e6090497695d668d78f0f3 /sys/dev | |
| parent | 3d16dc177bdefff9e0cc7c8ec980f9c5d36a8b37 (diff) | |
we_readmem() and ec_readmem() are inlined, but they can also be static.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/if_ec.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/if_we.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c index b5b06851978..b2d45be1e18 100644 --- a/sys/dev/isa/if_ec.c +++ b/sys/dev/isa/if_ec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ec.c,v 1.16 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_ec.c,v 1.17 2017/07/26 05:25:21 deraadt Exp $ */ /* $NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $ */ /*- @@ -110,7 +110,7 @@ void ec_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *); int ec_fake_test_mem(struct dp8390_softc *); int ec_test_mem(struct dp8390_softc *); -__inline void ec_readmem(struct ec_softc *, int, u_int8_t *, int); +static __inline void ec_readmem(struct ec_softc *, int, u_int8_t *, int); static const int ec_iobase[] = { 0x2e0, 0x2a0, 0x280, 0x250, 0x350, 0x330, 0x310, 0x300, @@ -539,7 +539,7 @@ ec_test_mem(struct dp8390_softc *sc) * copy 'len' from NIC to host using shared memory. The 'len' is rounded * up to a word - ok as long as mbufs are word-sized. */ -__inline void +static __inline void ec_readmem(struct ec_softc *esc, int from, u_int8_t *to, int len) { bus_space_tag_t memt = esc->sc_dp8390.sc_buft; diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c index c5f4d57c0ce..985660e0c14 100644 --- a/sys/dev/isa/if_we.c +++ b/sys/dev/isa/if_we.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_we.c,v 1.26 2015/11/24 17:11:39 mpi Exp $ */ +/* $OpenBSD: if_we.c,v 1.27 2017/07/26 05:25:21 deraadt Exp $ */ /* $NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $ */ /*- @@ -134,7 +134,7 @@ int we_ring_copy(struct dp8390_softc *, int, caddr_t, u_short); void we_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *); int we_test_mem(struct dp8390_softc *); -__inline void we_readmem(struct we_softc *, int, u_int8_t *, int); +static __inline void we_readmem(struct we_softc *, int, u_int8_t *, int); static const int we_584_irq[] = { 9, 3, 5, 7, 10, 11, 15, 4, @@ -584,7 +584,7 @@ we_test_mem(struct dp8390_softc *sc) * copy 'len' from NIC to host using shared memory. The 'len' is rounded * up to a word - ok as long as mbufs are word-sized. */ -__inline void +static __inline void we_readmem(struct we_softc *wsc, int from, u_int8_t *to, int len) { bus_space_tag_t memt = wsc->sc_dp8390.sc_buft; |