提交 c2b95610 编写于 作者: C Chris Packham 提交者: Yang Yingliang

of: use correct function prototype for of_overlay_fdt_apply()

[ Upstream commit ecb0abc1d8528015957fbd034be8bfe760363b3b ]

When CONFIG_OF_OVERLAY is not enabled the fallback stub for
of_overlay_fdt_apply() does not match the prototype for the case when
CONFIG_OF_OVERLAY is enabled. Update the stub to use the correct
function prototype.

Fixes: 39a751a4 ("of: change overlay apply input data from unflattened to FDT")
Signed-off-by: NChris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: NFrank Rowand <frank.rowand@sony.com>
Signed-off-by: NRob Herring <robh@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 b8f82df8
...@@ -1425,7 +1425,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb); ...@@ -1425,7 +1425,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
#else #else
static inline int of_overlay_fdt_apply(void *overlay_fdt, int *ovcs_id) static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size,
int *ovcs_id)
{ {
return -ENOTSUPP; return -ENOTSUPP;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册