Skip to content

Commit d56163a

Browse files
committed
Fix clang-tidy warnings
1 parent 0980f6d commit d56163a

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

src/kernel/hal/arch/riscv/memory_region.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include "../../hal_internal.h"
66
#include "../../include/memory_regions.h"
77

8-
static fdt_t hal_riscv_fdt;
9-
static bool hal_riscv_fdt_initialized = false;
8+
static fdt_t g_hal_riscv_fdt;
9+
static bool g_hal_riscv_fdt_initialized = false;
1010

1111
static error_t hal_riscv_read_u32_cells_be(buffer_t buf, size_t offset, u32 cell_count, u64* out);
1212

@@ -84,10 +84,11 @@ static error_t hal_riscv_find_next_memory_node(const fdt_t* fdt, dt_node_t node,
8484
return ERR_BAD_ARG;
8585

8686
error_t err;
87-
if (node != 0)
87+
if (node != 0) {
8888
err = dt_get_node_sibling(fdt, node, &node);
89-
else
89+
} else {
9090
err = dt_get_node_child(fdt, fdt->root_node, &node);
91+
}
9192
if (err)
9293
return err;
9394

@@ -254,7 +255,8 @@ error_t hal_get_next_reserved_region(hal_reserved_memory_iterator_t* iter, memor
254255
next_iter.resmem_address_cells, next_iter.resmem_size_cells, &addr, &size);
255256
if (err != ERR_NONE && err != ERR_NOT_FOUND) {
256257
return err;
257-
} else if (err == ERR_NONE) {
258+
}
259+
if (err == ERR_NONE) {
258260
memory_area_t area = {
259261
.addr = (uintptr_t)addr,
260262
.size = size,
@@ -337,7 +339,8 @@ error_t hal_get_next_memory_region(hal_memory_iterator_t* iter, physical_memory_
337339
err = hal_riscv_read_reg_entry(fdt, next_iter.node, next_iter.reg_idx, address_cells, size_cells, &addr, &size);
338340
if (err != ERR_NONE && err != ERR_NOT_FOUND) {
339341
return err;
340-
} else if (err == ERR_NONE) {
342+
}
343+
if (err == ERR_NONE) {
341344
const physical_memory_region_t area = {
342345
.addr = (__phys void*)(uintptr_t)addr,
343346
.size = size,

0 commit comments

Comments
 (0)