Remove the last of the rampant inline usage.

2 files changed, 34 insertions, 34 deletions

diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index ca5ce1674c4..c38d6f35a43 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtw.c,v 1.8 2005/01/19 11:07:32 jsg Exp $	*/
+/*	$OpenBSD: rtw.c,v 1.9 2005/01/19 11:29:27 jsg Exp $	*/
 /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
@@ -489,7 +489,7 @@ rtw_txdac_enable(struct rtw_softc *sc, int enable)
 	RTW_SYNC(regs, RTW_ANAPARM, RTW_ANAPARM);
 }
 
-__inline int
+int
 rtw_chip_reset1(struct rtw_regs *regs, const char *dvname)
 {
 	u_int8_t cr;
@@ -513,7 +513,7 @@ rtw_chip_reset1(struct rtw_regs *regs, const char *dvname)
 	return ETIMEDOUT;
 }
 
-__inline int
+int
 rtw_chip_reset(struct rtw_regs *regs, const char *dvname)
 {
 	uint32_t tcr;
@@ -529,7 +529,7 @@ rtw_chip_reset(struct rtw_regs *regs, const char *dvname)
 	return rtw_chip_reset1(regs, dvname);
 }
 
-__inline int
+int
 rtw_recall_eeprom(struct rtw_regs *regs, const char *dvname)
 {
 	int i;
@@ -556,7 +556,7 @@ rtw_recall_eeprom(struct rtw_regs *regs, const char *dvname)
 	return ETIMEDOUT;
 }
 
-__inline int
+int
 rtw_reset(struct rtw_softc *sc)
 {
 	int rc;
@@ -575,7 +575,7 @@ rtw_reset(struct rtw_softc *sc)
 	return 0;
 }
 
-__inline int
+int
 rtw_txdesc_dmamaps_create(bus_dma_tag_t dmat, struct rtw_txctl *descs,
     u_int ndescs)
 {
@@ -589,7 +589,7 @@ rtw_txdesc_dmamaps_create(bus_dma_tag_t dmat, struct rtw_txctl *descs,
 	return rc;
 }
 
-__inline int
+int
 rtw_rxdesc_dmamaps_create(bus_dma_tag_t dmat, struct rtw_rxctl *descs,
     u_int ndescs)
 {
@@ -603,7 +603,7 @@ rtw_rxdesc_dmamaps_create(bus_dma_tag_t dmat, struct rtw_rxctl *descs,
 	return rc;
 }
 
-__inline void
+void
 rtw_rxctls_setup(struct rtw_rxctl *descs)
 {
 	int i;
@@ -611,7 +611,7 @@ rtw_rxctls_setup(struct rtw_rxctl *descs)
 		descs[i].srx_mbuf = NULL;
 }
 
-__inline void
+void
 rtw_rxdesc_dmamaps_destroy(bus_dma_tag_t dmat, struct rtw_rxctl *descs,
     u_int ndescs)
 {
@@ -622,7 +622,7 @@ rtw_rxdesc_dmamaps_destroy(bus_dma_tag_t dmat, struct rtw_rxctl *descs,
 	}
 }
 
-__inline void
+void
 rtw_txdesc_dmamaps_destroy(bus_dma_tag_t dmat, struct rtw_txctl *descs,
     u_int ndescs)
 {
@@ -633,7 +633,7 @@ rtw_txdesc_dmamaps_destroy(bus_dma_tag_t dmat, struct rtw_txctl *descs,
 	}
 }
 
-__inline void
+void
 rtw_srom_free(struct rtw_srom *sr)
 {
 	sr->sr_size = 0;
@@ -881,7 +881,7 @@ rtw_set_rfprog(struct rtw_regs *regs, enum rtw_rfchipid rfchipid,
 }
 
 #if 0
-__inline int
+int
 rtw_identify_rf(struct rtw_regs *regs, enum rtw_rftype *rftype,
     const char *dvname)
 {
@@ -913,7 +913,7 @@ rtw_identify_rf(struct rtw_regs *regs, enum rtw_rftype *rftype,
 }
 #endif
 
-__inline void
+void
 rtw_init_channels(enum rtw_locale locale,
     struct ieee80211_channel (*chans)[IEEE80211_CHAN_MAX+1],
     const char *dvname)
@@ -954,7 +954,7 @@ rtw_init_channels(enum rtw_locale locale,
 #undef ADD_CHANNEL
 }
 
-__inline void
+void
 rtw_identify_country(struct rtw_regs *regs, enum rtw_locale *locale,
     const char *dvname)
 {
@@ -976,7 +976,7 @@ rtw_identify_country(struct rtw_regs *regs, enum rtw_locale *locale,
 	}
 }
 
-__inline int
+int
 rtw_identify_sta(struct rtw_regs *regs, u_int8_t (*addr)[IEEE80211_ADDR_LEN],
     const char *dvname)
 {
@@ -1053,7 +1053,7 @@ rtw_txctl_blk_init_all(struct rtw_txctl_blk *stcs)
 		rtw_txctl_blk_init(&stcs[pri]);
 }
 
-__inline void
+void
 rtw_rxdescs_sync(bus_dma_tag_t dmat, bus_dmamap_t dmap, u_int desc0, u_int
     nsync, int ops)
 {
@@ -1125,7 +1125,7 @@ rtw_rxbufs_release(bus_dma_tag_t dmat, struct rtw_rxctl *desc)
 	}
 }
 
-__inline int
+int
 rtw_rxbuf_alloc(bus_dma_tag_t dmat, struct rtw_rxctl *srx)
 {
 	int rc;
@@ -1179,7 +1179,7 @@ rtw_rxctl_init_all(bus_dma_tag_t dmat, struct rtw_rxctl *desc,
 	return 0;
 }
 
-__inline void
+void
 rtw_rxdesc_init(bus_dma_tag_t dmat, bus_dmamap_t dmam,
     struct rtw_rxdesc *hrx, struct rtw_rxctl *srx, int idx, int kick)
 {
@@ -1475,7 +1475,7 @@ rtw_txbufs_release(bus_dma_tag_t dmat, bus_dmamap_t desc_dmamap,
 	}
 }
 
-__inline void
+void
 rtw_collect_txpkt(struct rtw_softc *sc, struct rtw_txdesc_blk *htc,
     struct rtw_txctl *stx, int ndesc)
 {
@@ -1510,7 +1510,7 @@ rtw_collect_txpkt(struct rtw_softc *sc, struct rtw_txdesc_blk *htc,
 }
 
 /* Collect transmitted packets. */
-__inline void
+void
 rtw_collect_txring(struct rtw_softc *sc, struct rtw_txctl_blk *stc,
     struct rtw_txdesc_blk *htc)
 {
@@ -1741,7 +1741,7 @@ rtw_intr_ioerror(struct rtw_softc *sc, u_int16_t isr)
 	rtw_io_enable(regs, RTW_CR_RE | RTW_CR_TE, 1);
 }
 
-__inline void
+void
 rtw_suspend_ticks(struct rtw_softc *sc)
 {
 	RTW_DPRINTF(RTW_DEBUG_TIMEOUT,
@@ -1749,7 +1749,7 @@ rtw_suspend_ticks(struct rtw_softc *sc)
 	sc->sc_do_tick = 0;
 }
 
-__inline void
+void
 rtw_resume_ticks(struct rtw_softc *sc)
 {
 	u_int32_t tsftrl0, tsftrl1, next_tick;
@@ -2201,7 +2201,7 @@ rtw_transmit_config(struct rtw_regs *regs)
 	RTW_SYNC(regs, RTW_TCR, RTW_TCR);
 }
 
-__inline void
+void
 rtw_enable_interrupts(struct rtw_softc *sc)
 {
 	struct rtw_regs *regs = &sc->sc_regs;
@@ -2498,7 +2498,7 @@ rtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 /* Point *mp at the next 802.11 frame to transmit.  Point *stcp
  * at the driver's selection of transmit control block for the packet.
  */
-__inline int
+int
 rtw_dequeue(struct ifnet *ifp, struct rtw_txctl_blk **stcp,
     struct rtw_txdesc_blk **htcp, struct mbuf **mp,
     struct ieee80211_node **nip)
@@ -3141,7 +3141,7 @@ rtw_shutdown(void *arg)
 	rtw_stop(&sc->sc_ic.ic_if, 1);
 }
 
-__inline void
+void
 rtw_setifprops(struct ifnet *ifp, const char *dvname, void *softc)
 {
 	(void)memcpy(ifp->if_xname, dvname, IFNAMSIZ);
@@ -3153,7 +3153,7 @@ rtw_setifprops(struct ifnet *ifp, const char *dvname, void *softc)
 	ifp->if_watchdog = rtw_watchdog;
 }
 
-__inline void
+void
 rtw_set80211props(struct ieee80211com *ic)
 {
 	int nrate;
@@ -3172,7 +3172,7 @@ rtw_set80211props(struct ieee80211com *ic)
 	ic->ic_sup_rates[IEEE80211_MODE_11B].rs_nrates = nrate;
 }
 
-__inline void
+void
 rtw_set80211methods(struct rtw_mtbl *mtbl, struct ieee80211com *ic)
 {
 	mtbl->mt_newstate = ic->ic_newstate;
@@ -3188,7 +3188,7 @@ rtw_set80211methods(struct rtw_mtbl *mtbl, struct ieee80211com *ic)
 	ic->ic_node_alloc = rtw_node_alloc;
 }
 
-__inline void
+void
 rtw_establish_hooks(struct rtw_hooks *hooks, const char *dvname,
     void *arg)
 {
@@ -3210,7 +3210,7 @@ rtw_establish_hooks(struct rtw_hooks *hooks, const char *dvname,
 		    dvname);
 }
 
-__inline void
+void
 rtw_disestablish_hooks(struct rtw_hooks *hooks, const char *dvname,
     void *arg)
 {
@@ -3221,7 +3221,7 @@ rtw_disestablish_hooks(struct rtw_hooks *hooks, const char *dvname,
 		powerhook_disestablish(hooks->rh_power);
 }
 
-__inline void
+void
 rtw_init_radiotap(struct rtw_softc *sc)
 {
 	memset(&sc->sc_rxtapu, 0, sizeof(sc->sc_rxtapu));
diff --git a/sys/dev/ic/rtwphyio.c b/sys/dev/ic/rtwphyio.c
index 2090d62441f..6aa44e466d9 100644
--- a/sys/dev/ic/rtwphyio.c
+++ b/sys/dev/ic/rtwphyio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtwphyio.c,v 1.2 2005/01/19 11:07:33 jsg Exp $	*/
+/*	$OpenBSD: rtwphyio.c,v 1.3 2005/01/19 11:29:27 jsg Exp $	*/
 /* $NetBSD: rtwphyio.c,v 1.4 2004/12/25 06:58:37 dyoung Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
@@ -124,7 +124,7 @@ rtw_bbp_write(struct rtw_regs *regs, u_int addr, u_int val)
 }
 
 /* Help rtw_rf_hostwrite bang bits to RF over 3-wire interface. */
-__inline void
+void
 rtw_rf_hostbangbits(struct rtw_regs *regs, u_int32_t bits, int lo_to_hi,
     u_int nbits)
 {
@@ -181,7 +181,7 @@ rtw_rf_hostbangbits(struct rtw_regs *regs, u_int32_t bits, int lo_to_hi,
 /* Help rtw_rf_macwrite: tell MAC to bang bits to RF over the 3-wire
  * interface.
  */
-__inline int
+int
 rtw_rf_macbangbits(struct rtw_regs *regs, u_int32_t reg)
 {
 	int i;
@@ -234,7 +234,7 @@ rtw_grf5101_mac_crypt(u_int addr, u_int32_t val)
 #undef EXTRACT_NIBBLE
 }
 
-__inline const char *
+const char *
 rtw_rfchipid_string(enum rtw_rfchipid rfchipid)
 {
 	switch (rfchipid) {