diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2014-10-15 14:24:38 +0800 |
|---|---|---|
| committer | bryan newbold <bnewbold@twinleaf.com> | 2014-11-26 01:10:51 -0800 |
| commit | 91f5b9ec4f37f99be235a460e4f6d924ec2cf2a9 (patch) | |
| tree | df9a4cae02fb9c9708bac8aebee989211427b431 /libmaple | |
| parent | 485a74ab909a6d71a713ccbccdb093fcb3dfd309 (diff) | |
| download | librambutan-91f5b9ec4f37f99be235a460e4f6d924ec2cf2a9.tar.gz librambutan-91f5b9ec4f37f99be235a460e4f6d924ec2cf2a9.zip | |
Squash some GCC __always_inline warnings.
Change from __always_inline to plain inline to silence warnings about
possibly non-inlinable functions.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple')
| -rw-r--r-- | libmaple/include/libmaple/usb_cdcacm.h | 2 | ||||
| -rw-r--r-- | libmaple/stm32f1/include/series/spi.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libmaple/include/libmaple/usb_cdcacm.h b/libmaple/include/libmaple/usb_cdcacm.h index 5fe832c..b925883 100644 --- a/libmaple/include/libmaple/usb_cdcacm.h +++ b/libmaple/include/libmaple/usb_cdcacm.h @@ -168,7 +168,7 @@ int usb_cdcacm_get_n_data_bits(void); /* bDataBits */ void usb_cdcacm_set_hooks(unsigned hook_flags, void (*hook)(unsigned, void*)); -static __always_inline void usb_cdcacm_remove_hooks(unsigned hook_flags) { +static inline void usb_cdcacm_remove_hooks(unsigned hook_flags) { usb_cdcacm_set_hooks(hook_flags, 0); } diff --git a/libmaple/stm32f1/include/series/spi.h b/libmaple/stm32f1/include/series/spi.h index d288a0c..b65111b 100644 --- a/libmaple/stm32f1/include/series/spi.h +++ b/libmaple/stm32f1/include/series/spi.h @@ -75,13 +75,13 @@ extern void spi_config_gpios(struct spi_dev*, uint8, * @brief Deprecated. Use spi_config_gpios() instead. * @see spi_config_gpios() */ -static __always_inline void spi_gpio_cfg(uint8 as_master, - struct gpio_dev *nss_dev, - uint8 nss_bit, - struct gpio_dev *comm_dev, - uint8 sck_bit, - uint8 miso_bit, - uint8 mosi_bit) { +static inline void spi_gpio_cfg(uint8 as_master, + struct gpio_dev *nss_dev, + uint8 nss_bit, + struct gpio_dev *comm_dev, + uint8 sck_bit, + uint8 miso_bit, + uint8 mosi_bit) { /* We switched style globally to foo_config_gpios() and always * taking a foo_dev* argument (that last bit is the important * part) after this function was written. |