* [PATCH] of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY
@ 2023-09-04 10:00 Pavel Pisa
2023-09-04 11:07 ` Marc Kleine-Budde
2023-09-05 18:02 ` Rob Herring
0 siblings, 2 replies; 3+ messages in thread
From: Pavel Pisa @ 2023-09-04 10:00 UTC (permalink / raw)
To: linux-can, devicetree, Lizhi Hou, Rob Herring; +Cc: Pavel Pisa
The of_overlay_fdt_apply has been changed but when CONFIG_OF_OVERLAY
support is not configured then old stub prototype is declared
by of.h header.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---
include/linux/of.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/of.h b/include/linux/of.h
index ed679819c279..6a9ddf20e79a 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1676,8 +1676,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
#else
-static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size,
- int *ovcs_id)
+static inline int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
+ int *ovcs_id, struct device_node *target_base)
{
return -ENOTSUPP;
}
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY
2023-09-04 10:00 [PATCH] of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY Pavel Pisa
@ 2023-09-04 11:07 ` Marc Kleine-Budde
2023-09-05 18:02 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2023-09-04 11:07 UTC (permalink / raw)
To: Pavel Pisa; +Cc: linux-can, devicetree, Lizhi Hou, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
On 04.09.2023 12:00:02, Pavel Pisa wrote:
> The of_overlay_fdt_apply has been changed but when CONFIG_OF_OVERLAY
> support is not configured then old stub prototype is declared
> by of.h header.
>
> Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
You please add:
Fixes: 47284862bfc7 ("of: overlay: Extend of_overlay_fdt_apply() to specify the target node")
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Marc
> ---
> include/linux/of.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/of.h b/include/linux/of.h
> index ed679819c279..6a9ddf20e79a 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -1676,8 +1676,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
>
> #else
>
> -static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size,
> - int *ovcs_id)
> +static inline int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
> + int *ovcs_id, struct device_node *target_base)
> {
> return -ENOTSUPP;
> }
> --
> 2.39.2
>
>
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung Nürnberg | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY
2023-09-04 10:00 [PATCH] of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY Pavel Pisa
2023-09-04 11:07 ` Marc Kleine-Budde
@ 2023-09-05 18:02 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Rob Herring @ 2023-09-05 18:02 UTC (permalink / raw)
To: Pavel Pisa; +Cc: devicetree, linux-can, Lizhi Hou
On Mon, 04 Sep 2023 12:00:02 +0200, Pavel Pisa wrote:
> The of_overlay_fdt_apply has been changed but when CONFIG_OF_OVERLAY
> support is not configured then old stub prototype is declared
> by of.h header.
>
> Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
> ---
> include/linux/of.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-05 20:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-04 10:00 [PATCH] of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY Pavel Pisa
2023-09-04 11:07 ` Marc Kleine-Budde
2023-09-05 18:02 ` 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).