aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-05-08 16:06:17 -0500
committerRob Herring <robh@kernel.org>2014-05-20 14:25:21 -0500
commit9dd3107576c4bbd40e1c2c8b24d560abf9a7b991 (patch)
treecc83c624d4161a1efd013a047bc75eb965dae544
parentvmlinuz.lds: define OF table sections with macros (diff)
downloadlinux-dev-9dd3107576c4bbd40e1c2c8b24d560abf9a7b991.tar.xz
linux-dev-9dd3107576c4bbd40e1c2c8b24d560abf9a7b991.zip
of: align RESERVEDMEM_OF_DECLARE function callbacks to other callbacks
All the parameters for RESERVEDMEM_OF_DECLARE function callbacks are members of struct reserved_mem, so just pass the struct ptr to callback functions so the function callback is more in line with other OF match table callbacks. Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--drivers/of/of_reserved_mem.c2
-rw-r--r--include/linux/of_reserved_mem.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index e420eb52e5c9..632aae861375 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -188,7 +188,7 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem)
if (!of_flat_dt_is_compatible(rmem->fdt_node, compat))
continue;
- if (initfn(rmem, rmem->fdt_node, rmem->name) == 0) {
+ if (initfn(rmem) == 0) {
pr_info("Reserved memory: initialized node %s, compatible id %s\n",
rmem->name, compat);
return 0;
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h
index 9b1fbb7f29fc..4c81b84e95ff 100644
--- a/include/linux/of_reserved_mem.h
+++ b/include/linux/of_reserved_mem.h
@@ -21,8 +21,8 @@ struct reserved_mem_ops {
struct device *dev);
};
-typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem,
- unsigned long node, const char *uname);
+typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem);
+
#ifdef CONFIG_OF_RESERVED_MEM
void fdt_init_reserved_mem(void);