diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-18 10:07:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-18 10:07:49 -0400 |
| commit | 83fdb4388253240138e2ce364abe6b070b756d87 (patch) | |
| tree | 93767bc8b7fcbbb7f5668f7cb241a5eada644a9d /drivers/net | |
| parent | 7a81989b7b04bd87d1e684f2bafdc92a9c16fecc (diff) | |
| parent | c0a8d6e1e67cc7feee5c9e6c7e8c13bb953734f1 (diff) | |
Merge tag 'ti-v2020.10-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti into next
- DM conversion for OMAP4, OMAP5 platforms.
- Other minor fixes for Nokia RX51, am33, am57, am654.
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ti/cpsw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 95761fffc0..9d4332f450 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -17,6 +17,7 @@ #include <cpsw.h> #include <dm/device_compat.h> #include <linux/bitops.h> +#include <linux/compiler.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/io.h> @@ -247,11 +248,11 @@ static inline void cpsw_ale_set_field(u32 *ale_entry, u32 start, u32 bits, } #define DEFINE_ALE_FIELD(name, start, bits) \ -static inline int cpsw_ale_get_##name(u32 *ale_entry) \ +static inline int __maybe_unused cpsw_ale_get_##name(u32 *ale_entry) \ { \ return cpsw_ale_get_field(ale_entry, start, bits); \ } \ -static inline void cpsw_ale_set_##name(u32 *ale_entry, u32 value) \ +static inline void __maybe_unused cpsw_ale_set_##name(u32 *ale_entry, u32 value) \ { \ cpsw_ale_set_field(ale_entry, start, bits, value); \ } |