lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 298/639] of: use correct function prototype for of_overlay_fdt_apply()
    Date
    From: Chris Packham <chris.packham@alliedtelesis.co.nz>

    [ Upstream commit ecb0abc1d8528015957fbd034be8bfe760363b3b ]

    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: 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT")
    Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
    Reviewed-by: Frank Rowand <frank.rowand@sony.com>
    Signed-off-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 dac0201eacef7..d4f14b0302b63 100644
    --- a/include/linux/of.h
    +++ b/include/linux/of.h
    @@ -1425,7 +1425,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.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:17    [W:4.015 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site