[PATCH v2 1/3] mfd: max8998: Remove CONFIG_OF around max8998_dt_match

From	Florian Fainelli <f.fainelli@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/3] mfd: max8998: Remove CONFIG_OF around max8998_dt_match
Date	2017-04-12 06:50 +0200
Message-ID	<tvioa-8sz-7@gated-at.bofh.it> (permalink)
References	<tvio9-8sz-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

A subsequent patch is going to make of_match_node() an inline stub when
CONFIG_OF is disabled which will properly take care of having the compiler
eliminate the variable. To avoid more #ifdef/#else, just always make the match
table available.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/mfd/max8998.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 4c33b8063bc3..372f681ec1bb 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -129,14 +129,12 @@ int max8998_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask)
 }
 EXPORT_SYMBOL(max8998_update_reg);
 
-#ifdef CONFIG_OF
 static const struct of_device_id max8998_dt_match[] = {
 	{ .compatible = "maxim,max8998", .data = (void *)TYPE_MAX8998 },
 	{ .compatible = "national,lp3974", .data = (void *)TYPE_LP3974 },
 	{ .compatible = "ti,lp3974", .data = (void *)TYPE_LP3974 },
 	{},
 };
-#endif
 
 /*
  * Only the common platform data elements for max8998 are parsed here from the
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/3] mfd: max8998: Remove CONFIG_OF around max8998_dt_match Florian Fainelli <f.fainelli@gmail.com> - 2017-04-12 06:50 +0200
  Re: [PATCH v2 1/3] mfd: max8998: Remove CONFIG_OF around  max8998_dt_match Lee Jones <lee.jones@linaro.org> - 2017-04-12 10:00 +0200

csiph-web