2019-03-22 00:25:02

by Chris Packham

Subject: [PATCH] of: use correct function prototype for of_overlay_fdt_apply()

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: commit 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT")
Signed-off-by: Chris Packham <[email protected]>
---
include/linux/of.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/of.h b/include/linux/of.h
index e240992e5cb6..28797e1a9982 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1449,7 +1449,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);

#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;
}
--
2.21.0

2019-03-22 01:38:31

by Frank Rowand

Subject: Re: [PATCH] of: use correct function prototype for of_overlay_fdt_apply()

On 3/21/19 5:23 PM, Chris Packham wrote:
> 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: commit 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT")
> Signed-off-by: Chris Packham <[email protected]>
> ---
> include/linux/of.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/of.h b/include/linux/of.h
> index e240992e5cb6..28797e1a9982 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -1449,7 +1449,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
>
> #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;
> }
>

Thanks!

Reviewed-by: Frank Rowand <[email protected]>

2019-04-10 17:36:49

by Rob Herring (Arm)

Subject: Re: [PATCH] of: use correct function prototype for of_overlay_fdt_apply()

On Fri, Mar 22, 2019 at 01:23:41PM +1300, Chris Packham wrote:
> 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: commit 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT")
> Signed-off-by: Chris Packham <[email protected]>
> ---
> include/linux/of.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

Applied.

Rob