diff options
author | Rob Herring <robh@kernel.org> | 2014-05-08 17:06:17 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-05-20 15:25:21 -0400 |
commit | 9dd3107576c4bbd40e1c2c8b24d560abf9a7b991 (patch) | |
tree | cc83c624d4161a1efd013a047bc75eb965dae544 | |
parent | 063092883039e49e5edc1f63133dc5ad437361a2 (diff) |
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.c | 2 | ||||
-rw-r--r-- | include/linux/of_reserved_mem.h | 4 |
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) | |||
188 | if (!of_flat_dt_is_compatible(rmem->fdt_node, compat)) | 188 | if (!of_flat_dt_is_compatible(rmem->fdt_node, compat)) |
189 | continue; | 189 | continue; |
190 | 190 | ||
191 | if (initfn(rmem, rmem->fdt_node, rmem->name) == 0) { | 191 | if (initfn(rmem) == 0) { |
192 | pr_info("Reserved memory: initialized node %s, compatible id %s\n", | 192 | pr_info("Reserved memory: initialized node %s, compatible id %s\n", |
193 | rmem->name, compat); | 193 | rmem->name, compat); |
194 | return 0; | 194 | 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 { | |||
21 | struct device *dev); | 21 | struct device *dev); |
22 | }; | 22 | }; |
23 | 23 | ||
24 | typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem, | 24 | typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem); |
25 | unsigned long node, const char *uname); | 25 | |
26 | 26 | ||
27 | #ifdef CONFIG_OF_RESERVED_MEM | 27 | #ifdef CONFIG_OF_RESERVED_MEM |
28 | void fdt_init_reserved_mem(void); | 28 | void fdt_init_reserved_mem(void); |