OSDN Git Service

of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Mon, 4 Sep 2023 10:00:02 +0000 (12:00 +0200)
committerRob Herring <robh@kernel.org>
Tue, 5 Sep 2023 18:02:13 +0000 (13:02 -0500)
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>
Fixes: 47284862bfc7 ("of: overlay: Extend of_overlay_fdt_apply() to specify the target node")
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Link: https://lore.kernel.org/r/20230904100002.7913-1-pisa@cmp.felk.cvut.cz
Signed-off-by: Rob Herring <robh@kernel.org>
include/linux/of.h

index ed67981..6a9ddf2 100644 (file)
@@ -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;
 }