Re: [PATCH v2] ASoC: da7218: Drop CONFIG_OF ifdef

[Geert Uytterhoeven <geert@linux-m68k.org>]

Hi Stephen,

On Tue, Feb 2, 2021 at 8:20 PM Stephen Boyd <swboyd@chromium.org> wrote:
> This reverts commit a06cd8cf97a3 ("ASoC: da7218: skip of_device_id table
> when !CONFIG_OF") because we want to make of_match_device() stop using
> of_match_ptr() internally, confusing compilers and causing ifdef
> pollution.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Mark Brown <broonie@kernel.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>

Thanks for your patch!

> ---
>
> Changes from v1:
>  * Dropped of_match_ptr() in driver too
>
>  sound/soc/codecs/da7218.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c
> index 2bfafbe9e3dc..83cace9d0139 100644
> --- a/sound/soc/codecs/da7218.c
> +++ b/sound/soc/codecs/da7218.c
> @@ -2278,14 +2278,12 @@ static irqreturn_t da7218_irq_thread(int irq, void *data)
>   * DT
>   */
>
> -#ifdef CONFIG_OF
>  static const struct of_device_id da7218_of_match[] = {
>         { .compatible = "dlg,da7217", .data = (void *) DA7217_DEV_ID },
>         { .compatible = "dlg,da7218", .data = (void *) DA7218_DEV_ID },
>         { }
>  };
>  MODULE_DEVICE_TABLE(of, da7218_of_match);
> -#endif
>
>  static inline int da7218_of_get_id(struct device *dev)
>  {
> @@ -3311,7 +3309,7 @@ MODULE_DEVICE_TABLE(i2c, da7218_i2c_id);
>  static struct i2c_driver da7218_i2c_driver = {
>         .driver = {
>                 .name = "da7218",
> -               .of_match_table = of_match_ptr(da7218_of_match),
> +               .of_match_table = da7218_of_match,

This does mean the compiler can no longer optimize the table away
in the CONFIG_OF=n case. Is that intentional?

>         },
>         .probe          = da7218_i2c_probe,
>         .id_table       = da7218_i2c_id,
>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds