diff options
author | ed <ed@FreeBSD.org> | 2011-12-13 14:06:01 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2011-12-13 14:06:01 +0000 |
commit | 8f4291328fc8c526ced0d1d7afe013bc464ae0c3 (patch) | |
tree | 6511ce1e1f47db206a8f3a23f568bfc5fc44a836 | |
parent | 036b3a534b9846a059e610aff7167bf252da5fdd (diff) | |
download | FreeBSD-src-8f4291328fc8c526ced0d1d7afe013bc464ae0c3.zip FreeBSD-src-8f4291328fc8c526ced0d1d7afe013bc464ae0c3.tar.gz |
Replace `inline static' by `static inline'.
If I interpret the C standard correctly, the storage specifier should be
placed before the inline keyword. While at it, replace __inline by
inline in the files affected.
-rw-r--r-- | sys/boot/arm/at91/libat91/sd-card.c | 4 | ||||
-rw-r--r-- | sys/dev/cm/smc90cx6.c | 2 | ||||
-rw-r--r-- | sys/dev/de/if_de.c | 2 | ||||
-rw-r--r-- | sys/dev/fdc/fdc.c | 4 | ||||
-rw-r--r-- | sys/dev/pccard/pccardvar.h | 14 | ||||
-rw-r--r-- | sys/dev/spibus/spibusvar.h | 2 | ||||
-rw-r--r-- | sys/dev/xen/netback/netback.c | 2 | ||||
-rw-r--r-- | sys/pc98/cbus/scterm-sck.c | 4 | ||||
-rw-r--r-- | sys/pc98/cbus/scvtb.c | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/sys/boot/arm/at91/libat91/sd-card.c b/sys/boot/arm/at91/libat91/sd-card.c index d0b7beb..acc8e33 100644 --- a/sys/boot/arm/at91/libat91/sd-card.c +++ b/sys/boot/arm/at91/libat91/sd-card.c @@ -94,14 +94,14 @@ MCIDeviceWaitReady(unsigned int timeout) } // End of if AT91C_MCI_RXBUFF } -inline static unsigned int +static inline unsigned int swap(unsigned int a) { return (((a & 0xff) << 24) | ((a & 0xff00) << 8) | ((a & 0xff0000) >> 8) | ((a & 0xff000000) >> 24)); } -inline static void +static inline void wait_ready() { int status; diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c index 719e468..eb89675 100644 --- a/sys/dev/cm/smc90cx6.c +++ b/sys/dev/cm/smc90cx6.c @@ -596,7 +596,7 @@ cleanup: } } -__inline static void +static inline void cm_tint_locked(sc, isr) struct cm_softc *sc; int isr; diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index a9b9f31..5970bcd 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -1567,7 +1567,7 @@ tulip_null_media_poll(tulip_softc_t * const sc, tulip_mediapoll_event_t event) #endif } -__inline static void +static inline void tulip_21140_mediainit(tulip_softc_t * const sc, tulip_media_info_t * const mip, tulip_media_t const media, unsigned gpdata, unsigned cmdmode) { diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 00cdcd6..52260c1 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -314,14 +314,14 @@ fdsettype(struct fd_data *fd, struct fd_type *ft) /* * Bus space handling (access to low-level IO). */ -__inline static void +static inline void fdregwr(struct fdc_data *fdc, int reg, uint8_t v) { bus_space_write_1(fdc->iot, fdc->ioh[reg], fdc->ioff[reg], v); } -__inline static uint8_t +static inline uint8_t fdregrd(struct fdc_data *fdc, int reg) { diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 1cfcd58..f98bcc8 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -106,7 +106,7 @@ typedef int (*pccard_product_match_fn) (device_t dev, * make this inline so that we don't have to worry about dangling references * to it in the modules or the code. */ -static __inline const struct pccard_product * +static inline const struct pccard_product * pccard_product_lookup(device_t dev, const struct pccard_product *tab, size_t ent_size, pccard_product_match_fn matchfn) { @@ -150,31 +150,31 @@ pccard_product_lookup(device_t dev, const struct pccard_product *tab, /* Convenience functions */ -static __inline int +static inline int pccard_cis_scan(device_t dev, pccard_scan_t fct, void *arg) { return (CARD_CIS_SCAN(device_get_parent(dev), dev, fct, arg)); } -static __inline int +static inline int pccard_attr_read_1(device_t dev, uint32_t offset, uint8_t *val) { return (CARD_ATTR_READ(device_get_parent(dev), dev, offset, val)); } -static __inline int +static inline int pccard_attr_write_1(device_t dev, uint32_t offset, uint8_t val) { return (CARD_ATTR_WRITE(device_get_parent(dev), dev, offset, val)); } -static __inline int +static inline int pccard_ccr_read_1(device_t dev, uint32_t offset, uint8_t *val) { return (CARD_CCR_READ(device_get_parent(dev), dev, offset, val)); } -static __inline int +static inline int pccard_ccr_write_1(device_t dev, uint32_t offset, uint8_t val) { return (CARD_CCR_WRITE(device_get_parent(dev), dev, offset, val)); @@ -199,7 +199,7 @@ enum { }; #define PCCARD_ACCESSOR(A, B, T) \ -__inline static int \ +static inline int \ pccard_get_ ## A(device_t dev, T *t) \ { \ return BUS_READ_IVAR(device_get_parent(dev), dev, \ diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h index 543fcfe..c035be1 100644 --- a/sys/dev/spibus/spibusvar.h +++ b/sys/dev/spibus/spibusvar.h @@ -18,7 +18,7 @@ enum { }; #define SPIBUS_ACCESSOR(A, B, T) \ -__inline static int \ +static inline int \ spibus_get_ ## A(device_t dev, T *t) \ { \ return BUS_READ_IVAR(device_get_parent(dev), dev, \ diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c index f1af844..6dfb1e9 100644 --- a/sys/dev/xen/netback/netback.c +++ b/sys/dev/xen/netback/netback.c @@ -530,7 +530,7 @@ make_tx_response(netif_t *netif, #endif } -inline static void +static inline void net_tx_action_dealloc(void) { gnttab_unmap_grant_ref_t *gop; diff --git a/sys/pc98/cbus/scterm-sck.c b/sys/pc98/cbus/scterm-sck.c index b4bf70f..5232b20 100644 --- a/sys/pc98/cbus/scterm-sck.c +++ b/sys/pc98/cbus/scterm-sck.c @@ -133,7 +133,7 @@ static void scterm_scan_esc(scr_stat *scp, term_stat *tcp, static int mask2attr(term_stat *tcp); #ifdef KANJI -__inline static u_char +static inline u_char iskanji1(u_char mode, u_char c) { if (c > 0x80) { @@ -186,7 +186,7 @@ iskanji1(u_char mode, u_char c) return KTYPE_ASCII; } -__inline static u_char +static inline u_char iskanji2(u_char mode, u_char c) { switch (mode) { diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c index 2d0ea3f..c25ef14 100644 --- a/sys/pc98/cbus/scvtb.c +++ b/sys/pc98/cbus/scvtb.c @@ -174,7 +174,7 @@ sc_vtb_geta(sc_vtb_t *vtb, int at) return (*(u_int16_t *)(p + attr_offset(vtb)) & 0xff00); } -__inline static void +static inline void vtb_putc(sc_vtb_t *vtb, vm_offset_t p, int c, int a) { if (vtb->vtb_type == VTB_FRAMEBUFFER) { |