2024-05-28 22:37:38

by Oreoluwa Babatunde

Subject: [PATCH v6 4/4] of: reserved_mem: Rename fdt_* functions to refelct the change from using fdt APIs

Rename the relevant reserved_mem functions to account for them no longer
using the flattened devicetree (fdt) APIs.

Signed-off-by: Oreoluwa Babatunde <[email protected]>
---
drivers/of/fdt.c | 2 +-
drivers/of/of_private.h | 2 +-
drivers/of/of_reserved_mem.c | 22 +++++++++++-----------
3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 527e6bc1c096..79b7348ea7a4 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1259,7 +1259,7 @@ void __init unflatten_device_tree(void)
unittest_unflatten_overlay_base();

/* initialize the reserved memory regions */
- fdt_init_reserved_mem();
+ of_init_reserved_mem();
}

/**
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index d889b8c17ca3..7a744336084b 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -178,7 +178,7 @@ static inline struct device_node *__of_get_dma_parent(const struct device_node *
#endif

int fdt_scan_reserved_mem(void);
-void fdt_init_reserved_mem(void);
+void of_init_reserved_mem(void);

bool of_fdt_device_is_available(const void *blob, unsigned long node);

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 05283cd24c3b..e326bbef0a13 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -98,10 +98,10 @@ static void __init alloc_reserved_mem_array(void)
}

/*
- * fdt_reserved_mem_save_node() - save fdt node for second pass initialization
+ * of_reserved_mem_save_node() - save fdt node for second pass initialization
*/
-static void __init fdt_reserved_mem_save_node(struct device_node *node, const char *uname,
- phys_addr_t base, phys_addr_t size)
+static void __init of_reserved_mem_save_node(struct device_node *node, const char *uname,
+ phys_addr_t base, phys_addr_t size)
{
struct reserved_mem *rmem = &reserved_mem[reserved_mem_count];

@@ -231,16 +231,16 @@ static int __init of_reserved_mem_check_root(struct device_node *node)
}

/**
- * fdt_scan_reserved_mem_reg_nodes() - Store info for the "reg" defined
+ * of_scan_reserved_mem_reg_nodes() - Store info for the "reg" defined
* reserved memory regions.
*
* This function is used to scan through the DT and store the
* information for the reserved memory regions that are defined using
* the "reg" property. The region node number, name, base address, and
* size are all stored in the reserved_mem array by calling the
- * fdt_reserved_mem_save_node() function.
+ * of_reserved_mem_save_node() function.
*/
-static void __init fdt_scan_reserved_mem_reg_nodes(void)
+static void __init of_scan_reserved_mem_reg_nodes(void)
{
struct device_node *node, *child;
phys_addr_t base, size;
@@ -278,7 +278,7 @@ static void __init fdt_scan_reserved_mem_reg_nodes(void)
size = res.end - res.start + 1;

if (size)
- fdt_reserved_mem_save_node(child, uname, base, size);
+ of_reserved_mem_save_node(child, uname, base, size);
}
}

@@ -476,7 +476,7 @@ static int __init __reserved_mem_alloc_size(unsigned long node, const char *unam
uname, (unsigned long)(size / SZ_1M));
return -ENOMEM;
}
- fdt_reserved_mem_save_node(NULL, uname, base, size);
+ of_reserved_mem_save_node(NULL, uname, base, size);
return 0;
}

@@ -560,15 +560,15 @@ static void __init __rmem_check_for_overlap(void)
}

/**
- * fdt_init_reserved_mem() - allocate and init all saved reserved memory regions
+ * of_init_reserved_mem() - allocate and init all saved reserved memory regions
*/
-void __init fdt_init_reserved_mem(void)
+void __init of_init_reserved_mem(void)
{
int i;

alloc_reserved_mem_array();

- fdt_scan_reserved_mem_reg_nodes();
+ of_scan_reserved_mem_reg_nodes();

/* check for overlapping reserved regions */
__rmem_check_for_overlap();
--
2.34.1