summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorstefanf <stefanf@FreeBSD.org>2004-07-04 16:11:03 +0000
committerstefanf <stefanf@FreeBSD.org>2004-07-04 16:11:03 +0000
commit9dea8aeba1c4f733fc95d1dfd11cfc8d3092a654 (patch)
tree0e3fe3a61275cb24fb693e8710ebc6420adf5306 /sys/dev
parentc8bc9c77afa1fbbf704376606a236020afdfba8e (diff)
downloadFreeBSD-src-9dea8aeba1c4f733fc95d1dfd11cfc8d3092a654.zip
FreeBSD-src-9dea8aeba1c4f733fc95d1dfd11cfc8d3092a654.tar.gz
Consistently use __inline instead of __inline__ as the former is an empty macro
in <sys/cdefs.h> for compilers without support for inline.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/de/if_de.c2
-rw-r--r--sys/dev/de/if_devar.h4
-rw-r--r--sys/dev/hifn/hifn7751.c4
-rw-r--r--sys/dev/pcf/pcfvar.h8
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 6c3592e..0c39d7c 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1514,7 +1514,7 @@ tulip_null_media_poll(
#endif
}
-__inline__ static void
+__inline static void
tulip_21140_mediainit(
tulip_softc_t * const sc,
tulip_media_info_t * const mip,
diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h
index 9b47cca..10a4306 100644
--- a/sys/dev/de/if_devar.h
+++ b/sys/dev/de/if_devar.h
@@ -880,7 +880,7 @@ NETISR_SET(NETISR_DE, tulip_softintr);
} while (0)
#if defined(__i386__)
typedef u_quad_t tulip_cycle_t;
-static __inline__ tulip_cycle_t
+static __inline tulip_cycle_t
TULIP_PERFREAD(
void)
{
@@ -891,7 +891,7 @@ TULIP_PERFREAD(
#define TULIP_PERFDIFF(s, f) ((f) - (s))
#elif defined(__alpha__)
typedef unsigned long tulip_cycle_t;
-static __inline__ tulip_cycle_t
+static __inline tulip_cycle_t
TULIP_PERFREAD(
void)
{
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index 4116453..c2b5fc9 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -151,7 +151,7 @@ static void hifn_alloc_slot(struct hifn_softc *, int *, int *, int *, int *);
static void hifn_write_reg_0(struct hifn_softc *, bus_size_t, u_int32_t);
static void hifn_write_reg_1(struct hifn_softc *, bus_size_t, u_int32_t);
-static __inline__ u_int32_t
+static __inline u_int32_t
READ_REG_0(struct hifn_softc *sc, bus_size_t reg)
{
u_int32_t v = bus_space_read_4(sc->sc_st0, sc->sc_sh0, reg);
@@ -160,7 +160,7 @@ READ_REG_0(struct hifn_softc *sc, bus_size_t reg)
}
#define WRITE_REG_0(sc, reg, val) hifn_write_reg_0(sc, reg, val)
-static __inline__ u_int32_t
+static __inline u_int32_t
READ_REG_1(struct hifn_softc *sc, bus_size_t reg)
{
u_int32_t v = bus_space_read_4(sc->sc_st1, sc->sc_sh1, reg);
diff --git a/sys/dev/pcf/pcfvar.h b/sys/dev/pcf/pcfvar.h
index ce7e9a9..258cfb7 100644
--- a/sys/dev/pcf/pcfvar.h
+++ b/sys/dev/pcf/pcfvar.h
@@ -86,7 +86,7 @@ struct pcf_softc {
/*
* Specific register access to PCF8584
*/
-static __inline__ void
+static __inline void
pcf_set_S0(struct pcf_softc *sc, int data)
{
bus_space_write_1(sc->res_ioport->r_bustag,
@@ -95,7 +95,7 @@ pcf_set_S0(struct pcf_softc *sc, int data)
pcf_nops();
}
-static __inline__ void
+static __inline void
pcf_set_S1(struct pcf_softc *sc, int data)
{
bus_space_write_1(sc->res_ioport->r_bustag,
@@ -104,7 +104,7 @@ pcf_set_S1(struct pcf_softc *sc, int data)
pcf_nops();
}
-static __inline__ char
+static __inline char
pcf_get_S0(struct pcf_softc *sc)
{
char data;
@@ -116,7 +116,7 @@ pcf_get_S0(struct pcf_softc *sc)
return (data);
}
-static __inline__ char
+static __inline char
pcf_get_S1(struct pcf_softc *sc)
{
char data;
OpenPOWER on IntegriCloud