Unverified Commit 0dd4d3e8 authored by Stephen Boyd's avatar Stephen Boyd Committed by Mark Brown
Browse files

ASoC: da7218: Drop CONFIG_OF ifdef 



This reverts commit a06cd8cf ("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: default avatarkernel test robot <lkp@intel.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210202192016.49028-1-swboyd@chromium.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1c4273a5

sound/soc/codecs/da7218.c

+1 −3
Original line number Diff line number Diff line
@@ -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,

	},

	.probe		= da7218_i2c_probe,

	.id_table	= da7218_i2c_id,