diff options
| author | Joel Kitching <kitching@google.com> | 2019-10-21 22:41:17 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-23 16:28:20 +0000 |
| commit | c7a384c92d83eac81506e3898f2db741f14a17f1 (patch) | |
| tree | 81dc6c73de1aa9b8371288cc7a04dc6bf48cf67b | |
| parent | c58b499308d16dddedc80f5ecb973e38b46e18fc (diff) | |
| download | vboot-c7a384c92d83eac81506e3898f2db741f14a17f1.tar.gz | |
vboot: use inline instead of __inline
Use official inline keyword instead of compiler-specific
__inline.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ica2b2bd5f2af5188209dad6b5ba6f317b8229b99
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1872252
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | firmware/2lib/include/2common.h | 6 | ||||
| -rw-r--r-- | firmware/2lib/include/2misc.h | 2 | ||||
| -rw-r--r-- | firmware/2lib/include/2secdata_struct.h | 2 | ||||
| -rw-r--r-- | host/lib/include/host_misc.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/firmware/2lib/include/2common.h b/firmware/2lib/include/2common.h index 535623f5..cf5b57ea 100644 --- a/firmware/2lib/include/2common.h +++ b/firmware/2lib/include/2common.h @@ -98,7 +98,7 @@ struct vb2_public_key; * @param v Number to round up * @return The number, rounded up. */ -static __inline uint32_t vb2_wb_round_up(uint32_t v) +static inline uint32_t vb2_wb_round_up(uint32_t v) { return (v + VB2_WORKBUF_ALIGN - 1) & ~(VB2_WORKBUF_ALIGN - 1); } @@ -303,7 +303,7 @@ int vb2_verify_packed_key_inside(const void *parent, /* * Helper functions to get data pointed to by a public key or signature. */ -static __inline uint8_t *vb2_signature_data(struct vb2_signature *sig) +static inline uint8_t *vb2_signature_data(struct vb2_signature *sig) { return (uint8_t *)sig + sig->sig_offset; } @@ -316,7 +316,7 @@ static __inline uint8_t *vb2_signature_data(struct vb2_signature *sig) * @param sig Signature pointer * @return VB2_SUCCESS, or non-zero if error. */ -static __inline vb2_error_t vb2_verify_signature_inside( +static inline vb2_error_t vb2_verify_signature_inside( const void *parent, uint32_t parent_size, const struct vb2_signature *sig) diff --git a/firmware/2lib/include/2misc.h b/firmware/2lib/include/2misc.h index 6b305169..5ce10705 100644 --- a/firmware/2lib/include/2misc.h +++ b/firmware/2lib/include/2misc.h @@ -20,7 +20,7 @@ struct vb2_workbuf; * @param ctx Vboot context * @return The shared data pointer. */ -static __inline struct vb2_shared_data *vb2_get_sd(struct vb2_context *ctx) +static inline struct vb2_shared_data *vb2_get_sd(struct vb2_context *ctx) { return (struct vb2_shared_data *)ctx->workbuf; } diff --git a/firmware/2lib/include/2secdata_struct.h b/firmware/2lib/include/2secdata_struct.h index 92c2408c..7a835dd7 100644 --- a/firmware/2lib/include/2secdata_struct.h +++ b/firmware/2lib/include/2secdata_struct.h @@ -92,7 +92,7 @@ struct vb2_secdata_fwmp { * @param sec Pointer to FWMP struct * @return 32-bit CRC hash of FWMP data */ -static __inline uint32_t vb2_secdata_fwmp_crc(struct vb2_secdata_fwmp *sec) +static inline uint32_t vb2_secdata_fwmp_crc(struct vb2_secdata_fwmp *sec) { int version_offset = offsetof(struct vb2_secdata_fwmp, struct_version); return vb2_crc8((void *)sec + version_offset, diff --git a/host/lib/include/host_misc.h b/host/lib/include/host_misc.h index 65949508..1aed20a7 100644 --- a/host/lib/include/host_misc.h +++ b/host/lib/include/host_misc.h @@ -81,7 +81,7 @@ vb2_error_t vb21_write_object(const char *filename, const void *buf); /** * Round up a size to a multiple of 32 bits (4 bytes). */ -static __inline const uint32_t roundup32(uint32_t v) +static inline const uint32_t roundup32(uint32_t v) { return (v + 3) & ~3; } |