| Message ID | 20210202183646.38602-1-swboyd@chromium.org |
|---|---|
| State | New |
| Headers | show |
| Series | [for-next] ASoC: da7218: Drop CONFIG_OF ifdef | expand |
On Tue, 2 Feb 2021 10:36:46 -0800, Stephen Boyd 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. 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
diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index 2bfafbe9e3dc..6d78bccb55c3 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) {
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> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- Please ack so Rob can take through DT tree. sound/soc/codecs/da7218.c | 2 -- 1 file changed, 2 deletions(-) base-commit: 19c329f6808995b142b3966301f217c831e7cf31