| Message ID | 20230904100002.7913-1-pisa@cmp.felk.cvut.cz |
|---|---|
| State | Accepted |
| Headers | show |
| Series | of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success | |
| robh/patch-applied | fail | build log |
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 > >
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!
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; }
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(-)