* [PATCH] of: use correct function prototype for of_overlay_fdt_apply()
@ 2019-03-22 0:23 Chris Packham
2019-03-22 1:37 ` Frank Rowand
2019-04-10 13:59 ` Rob Herring
0 siblings, 2 replies; 3+ messages in thread
From: Chris Packham @ 2019-03-22 0:23 UTC (permalink / raw)
To: robh+dt, frowand.list
Cc: Hamish Martin, devicetree, linux-kernel, Chris Packham
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 <chris.packham@alliedtelesis.co.nz>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] of: use correct function prototype for of_overlay_fdt_apply()
2019-03-22 0:23 [PATCH] of: use correct function prototype for of_overlay_fdt_apply() Chris Packham
@ 2019-03-22 1:37 ` Frank Rowand
2019-04-10 13:59 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Frank Rowand @ 2019-03-22 1:37 UTC (permalink / raw)
To: Chris Packham, robh+dt; +Cc: Hamish Martin, devicetree, linux-kernel
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 <chris.packham@alliedtelesis.co.nz>
> ---
> 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 <frank.rowand@sony.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] of: use correct function prototype for of_overlay_fdt_apply()
2019-03-22 0:23 [PATCH] of: use correct function prototype for of_overlay_fdt_apply() Chris Packham
2019-03-22 1:37 ` Frank Rowand
@ 2019-04-10 13:59 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Rob Herring @ 2019-04-10 13:59 UTC (permalink / raw)
To: Chris Packham; +Cc: frowand.list, Hamish Martin, devicetree, linux-kernel
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 <chris.packham@alliedtelesis.co.nz>
> ---
> include/linux/of.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Applied.
Rob
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-10 13:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-22 0:23 [PATCH] of: use correct function prototype for of_overlay_fdt_apply() Chris Packham
2019-03-22 1:37 ` Frank Rowand
2019-04-10 13:59 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).