[PATCH 2/2] fdtdec: dtb_dt_embedded: replace ifdefs by IS_ENABLED()

[Simon Glass]

On Tue, 10 Dec 2024 at 15:40, Evgeny Bachinin
<EABachinin at salutedevices.com> wrote:
>
> Patch fixes the checkpatch warnings like:
> ```
>   WARNING: Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef'
>   #94: FILE: lib/fdtdec.c:102:
>   +#ifdef CONFIG_OF_EMBED
> ```
>
> Signed-off-by: Evgeny Bachinin <EABachinin at salutedevices.com>
> ---
>  lib/fdtdec.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>

Reviewed-by: Simon Glass <sjg at chromium.org>

Yes that is better and I'm pleased that it works


> diff --git a/lib/fdtdec.c b/lib/fdtdec.c
> index 9cb94a158441cfd291a0f173c321a722e896bcb2..7f1418890860a759efcf2b84551d24a3697e4a4b 100644
> --- a/lib/fdtdec.c
> +++ b/lib/fdtdec.c
> @@ -99,15 +99,15 @@ extern u8 __dtb_dt_spl_begin[];     /* embedded device tree blob for SPL/TPL */
>  /* Get a pointer to the embedded devicetree, if there is one, else NULL */
>  static u8 *dtb_dt_embedded(void)
>  {
> -#ifdef CONFIG_OF_EMBED
> -# ifdef CONFIG_XPL_BUILD
> -       return __dtb_dt_spl_begin;
> -# else
> -       return __dtb_dt_begin;
> -# endif
> -#else
> -       return NULL;
> -#endif
> +       u8 *addr = NULL;
> +
> +       if (IS_ENABLED(CONFIG_OF_EMBED)) {
> +               addr = __dtb_dt_begin;
> +
> +               if (IS_ENABLED(CONFIG_XPL_BUILD))
> +                       addr = __dtb_dt_spl_begin;
> +       }
> +       return addr;
>  }
>
>  const char *fdtdec_get_srcname(void)
>
> --
> 2.34.1
>