Skip to contentSkip to conversation

ASoC: da7218: Drop CONFIG_OF ifdef

PATCH Superseded Stephen Boyd 3 participants 3 messages Feb 2, 2021 – Feb 5, 2021

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: da7218: Drop CONFIG_OF ifdef

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.

Cc Geert Uytterhoeven <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Mark Brown <[email protected]>

---

Please ack so Rob can take through DT tree.

 sound/soc/codecs/da7218.c | 2 --
 1 file changed, 2 deletions(-)
sound/soc/codecs/da7218.c +0 -2
index 2bfafbe9e3dc..6d78bccb55c3 100644
@@ -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)
 {

base-commit: 19c329f6808995b142b3966301f217c831e7cf31

Signature · 1 line
https://chromeos.dev
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Stephen Boyd

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.

Quoted 8 lines
Cc Geert Uytterhoeven <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Mark Brown <[email protected]>

---

Please ack so Rob can take through DT tree.

Looks reasonable as a compile-time fix, though I'd remove the of_match_ptr() usage as well in this case and just always reference the device id table.

Either way:

maintainer
#2 lore raw
In reply to Stephen Boyd
Quoted 4 lines · Stephen Boyd

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.

Applied to

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

Thanks!

[1/1] ASoC: da7218: Drop CONFIG_OF ifdef

      commit: 0dd4d3e8c3a8ab63e9368e01d7839afad7b804c7

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