Skip to content

Commit

Permalink
of: align RESERVEDMEM_OF_DECLARE function callbacks to other callbacks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rob Herring committed May 20, 2014
1 parent 0630928 commit 9dd3107
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/of/of_reserved_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions include/linux/of_reserved_mem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9dd3107

Please sign in to comment.