Re: [PATCH v2 1/5] ASoC: Explicitly include correct DT includes

Re: [PATCH v2 1/5] ASoC: Explicitly include correct DT includes

[claudiu beznea]

On 04.10.2023 18:58, Rob Herring wrote:
> The DT of_device.h and of_platform.h date back to the separate
> of_platform_bus_type before it was merged into the regular platform bus.
> As part of that merge prepping Arm DT support 13 years ago, they
> "temporarily" include each other. They also include platform_device.h
> and of.h. As a result, there's a pretty much random mix of those include
> files used throughout the tree. In order to detangle these headers and
> replace the implicit includes with struct declarations, users need to
> explicitly include the correct includes.
> 
> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  sound/soc/atmel/atmel_wm8904.c                             | 1 -
>  sound/soc/atmel/mchp-i2s-mcc.c                             | 2 +-
>  sound/soc/atmel/tse850-pcm5142.c                           | 1 -

Reviewed-by: Claudiu Beznea <claudiu.beznea@tuxon.dev> # for at91

Re: [PATCH v2 1/5] ASoC: Explicitly include correct DT includes

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2266 bytes --]

On Wed, Oct 04, 2023 at 10:58:05AM -0500, Rob Herring wrote:
> The DT of_device.h and of_platform.h date back to the separate
> of_platform_bus_type before it was merged into the regular platform bus.
> As part of that merge prepping Arm DT support 13 years ago, they
> "temporarily" include each other. They also include platform_device.h
> and of.h. As a result, there's a pretty much random mix of those include
> files used throughout the tree. In order to detangle these headers and
> replace the implicit includes with struct declarations, users need to
> explicitly include the correct includes.

This is breaking various builds for me, for example arm64 defconfig:

/build/stage/linux/sound/soc/rockchip/rockchip_i2s_tdm.c: In function ‘rockchip_i2s_tdm_probe’:
/build/stage/linux/sound/soc/rockchip/rockchip_i2s_tdm.c:1557:17: error: implicit declaration of function ‘of_match_device’; did you mean ‘of_match_node’? [-Werror=implicit-function-declaration]
 1557 |         of_id = of_match_device(rockchip_i2s_tdm_match, &pdev->dev);
      |                 ^~~~~~~~~~~~~~~
      |                 of_match_node
/build/stage/linux/sound/soc/rockchip/rockchip_i2s_tdm.c:1557:15: warning: assignment to ‘const struct of_device_id *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
 1557 |         of_id = of_match_device(rockchip_i2s_tdm_match, &pdev->dev);
      |               ^
/build/stage/linux/sound/soc/tegra/tegra210_amx.c: In function ‘tegra210_amx_platform_probe’:
/build/stage/linux/sound/soc/tegra/tegra210_amx.c:541:17: error: implicit declaration of function ‘of_match_device’; did you mean ‘of_match_node’? [-Werror=implicit-function-declaration]
  541 |         match = of_match_device(tegra210_amx_of_match, dev);
      |                 ^~~~~~~~~~~~~~~
      |                 of_match_node
/build/stage/linux/sound/soc/tegra/tegra210_amx.c:541:15: warning: assignment to ‘const struct of_device_id *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
  541 |         match = of_match_device(tegra210_amx_of_match, dev);
      |               ^
cc1: some warnings being treated as errors

multi_v7_defconfig is also broken.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH v2 1/5] ASoC: Explicitly include correct DT includes

[Rob Herring]

On Wed, Oct 4, 2023 at 12:39 PM Mark Brown <broonie@kernel.org> wrote:
>
> On Wed, Oct 04, 2023 at 10:58:05AM -0500, Rob Herring wrote:
> > The DT of_device.h and of_platform.h date back to the separate
> > of_platform_bus_type before it was merged into the regular platform bus.
> > As part of that merge prepping Arm DT support 13 years ago, they
> > "temporarily" include each other. They also include platform_device.h
> > and of.h. As a result, there's a pretty much random mix of those include
> > files used throughout the tree. In order to detangle these headers and
> > replace the implicit includes with struct declarations, users need to
> > explicitly include the correct includes.
>
> This is breaking various builds for me, for example arm64 defconfig:

I believe I got some of the include changes in the wrong place. They
should go into patch 5.

Rob

Re: [PATCH v2 0/5] ASoC: DT matching and header cleanups

[Mark Brown]

On Wed, 04 Oct 2023 10:58:04 -0500, Rob Herring wrote:
> (trimmed the recipient list due to bounces on v1)
> 
> This is a series is part of ongoing clean-ups related to device
> matching and DT related implicit includes. Essentially of_device.h has
> a bunch of implicit includes and generally isn't needed any nore except
> for of_match_device(). As we also generally want to get rid of
> of_match_device() as well, I've done that so we're not updating the
> includes twice.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/5] ASoC: Explicitly include correct DT includes
      commit: 340d79a14d6ab5066ba40651764db20bd151aea7
[2/5] ASoC: Drop unnecessary of_match_device() calls
      commit: 56c075b2d31c626370481a62d334a0575f751522
[3/5] ASoC: da7218: Use i2c_get_match_data()
      commit: fe26425518862020449cb2c9709e62cc76a56de2
[4/5] ASoC: qcom/lpass: Constify struct lpass_variant
      commit: ec5236c2e6ec1ce62237a2e9345dd2ffc4fc6d56
[5/5] ASoC: Use device_get_match_data()
      commit: 9958d85968ed2df4b704105fd2a9c3669eb9cd97

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark