chore: fix `clang-tidy` warnings
Fix warnings introduced by previous commit.
Change-Id: I3884f8a774860905ddf3d4554f986fde16ec9919
Signed-off-by: Karl Meakin <karl.meakin@arm.com>
diff --git a/inc/vmapi/hf/call.h b/inc/vmapi/hf/call.h
index 5886763..5e68e2e 100644
--- a/inc/vmapi/hf/call.h
+++ b/inc/vmapi/hf/call.h
@@ -19,6 +19,7 @@
int64_t hf_call(uint64_t arg0, uint64_t arg1, uint64_t arg2, uint64_t arg3);
struct ffa_value ffa_call(struct ffa_value args);
struct ffa_value ffa_call_ext(struct ffa_value args);
+/* NOLINTNEXTLINE(readability-redundant-declaration) */
void memcpy_s(void *dest, size_t destsz, const void *src, size_t count);
/**
diff --git a/inc/vmapi/hf/ffa.h b/inc/vmapi/hf/ffa.h
index a13e505..44e3565 100644
--- a/inc/vmapi/hf/ffa.h
+++ b/inc/vmapi/hf/ffa.h
@@ -970,7 +970,7 @@
* FF-A v1.1 specification restricts the number of notifications to a maximum
* of 64. Following all possible bitmaps.
*/
-#define FFA_NOTIFICATION_MASK(ID) (UINT64_C(1) << ID)
+#define FFA_NOTIFICATION_MASK(ID) (UINT64_C(1) << (ID))
typedef uint64_t ffa_notifications_bitmap_t;
@@ -1071,7 +1071,7 @@
*/
#define FFA_NOTIFICATIONS_LISTS_COUNT_SHIFT 0x7U
#define FFA_NOTIFICATIONS_LISTS_COUNT_MASK 0x1fU
-#define FFA_NOTIFICATIONS_LIST_SHIFT(l) (2 * (l - 1) + 12)
+#define FFA_NOTIFICATIONS_LIST_SHIFT(l) (2 * ((l) - 1) + 12)
#define FFA_NOTIFICATIONS_LIST_SIZE_MASK 0x3U
static inline uint32_t ffa_notification_info_get_lists_count(
@@ -1308,10 +1308,10 @@
return NULL;
}
- return (struct ffa_memory_access *)((uint8_t *)memory_region +
- memory_region->receivers_offset +
- (receiver_index *
- memory_access_desc_size));
+ return (struct ffa_memory_access
+ *)((uint8_t *)memory_region +
+ (size_t)memory_region->receivers_offset +
+ (size_t)(receiver_index * memory_access_desc_size));
}
/**
@@ -1443,14 +1443,14 @@
static inline struct ffa_composite_memory_region *
ffa_endpoint_get_rx_memory_region(struct ffa_endpoint_rx_tx_descriptor *desc)
{
- return (struct ffa_composite_memory_region *)((uintptr_t)desc +
+ return (struct ffa_composite_memory_region *)((char *)desc +
desc->rx_offset);
}
static inline struct ffa_composite_memory_region *
ffa_endpoint_get_tx_memory_region(struct ffa_endpoint_rx_tx_descriptor *desc)
{
- return (struct ffa_composite_memory_region *)((uintptr_t)desc +
+ return (struct ffa_composite_memory_region *)((char *)desc +
desc->tx_offset);
}