* [PATCH] mfd: max8997: Use "IS_ENABLED(CONFIG_OF)" for DT code.
@ 2013-12-22 17:48 Manish Badarkhe
2014-01-05 8:10 ` Manish Badarkhe
0 siblings, 1 reply; 3+ messages in thread
From: Manish Badarkhe @ 2013-12-22 17:48 UTC (permalink / raw)
To: devicetree, linux-samsung-soc, linux-kernel
Cc: sameo, lee.jones, badarkhe.manish
Instead of "#if define CONFIG_OF" use "IS_ENABLED(CONFIG_OF)"
option for DT code to avoid if-deffery in code.
Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com>
---
:100644 100644 791aea3... be9a8b0... M drivers/mfd/max8997.c
drivers/mfd/max8997.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 791aea3..be9a8b0 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -133,7 +133,6 @@ int max8997_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask)
}
EXPORT_SYMBOL_GPL(max8997_update_reg);
-#ifdef CONFIG_OF
/*
* Only the common platform data elements for max8997 are parsed here from the
* device tree. Other sub-modules of max8997 such as pmic, rtc and others have
@@ -164,24 +163,15 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
return pd;
}
-#else
-static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
- struct device *dev)
-{
- return 0;
-}
-#endif
static inline int max8997_i2c_get_driver_data(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
-#ifdef CONFIG_OF
- if (i2c->dev.of_node) {
+ if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
const struct of_device_id *match;
match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
return (int)match->data;
}
-#endif
return (int)id->driver_data;
}
@@ -203,7 +193,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
max8997->type = max8997_i2c_get_driver_data(i2c, id);
max8997->irq = i2c->irq;
- if (max8997->dev->of_node) {
+ if (IS_ENABLED(CONFIG_OF) && max8997->dev->of_node) {
pdata = max8997_i2c_parse_dt_pdata(max8997->dev);
if (IS_ERR(pdata))
return PTR_ERR(pdata);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] mfd: max8997: Use "IS_ENABLED(CONFIG_OF)" for DT code.
2013-12-22 17:48 [PATCH] mfd: max8997: Use "IS_ENABLED(CONFIG_OF)" for DT code Manish Badarkhe
@ 2014-01-05 8:10 ` Manish Badarkhe
2014-01-06 10:51 ` Lee Jones
0 siblings, 1 reply; 3+ messages in thread
From: Manish Badarkhe @ 2014-01-05 8:10 UTC (permalink / raw)
To: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: sameo, Lee Jones,
मनिष बदरखे
Hi Samuel,
On Sun, Dec 22, 2013 at 11:18 PM, Manish Badarkhe
<badarkhe.manish@gmail.com> wrote:
>
> Instead of "#if define CONFIG_OF" use "IS_ENABLED(CONFIG_OF)"
> option for DT code to avoid if-deffery in code.
>
> Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com>
> ---
> :100644 100644 791aea3... be9a8b0... M drivers/mfd/max8997.c
> drivers/mfd/max8997.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
> index 791aea3..be9a8b0 100644
> --- a/drivers/mfd/max8997.c
> +++ b/drivers/mfd/max8997.c
> @@ -133,7 +133,6 @@ int max8997_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask)
> }
> EXPORT_SYMBOL_GPL(max8997_update_reg);
>
> -#ifdef CONFIG_OF
> /*
> * Only the common platform data elements for max8997 are parsed here from the
> * device tree. Other sub-modules of max8997 such as pmic, rtc and others have
> @@ -164,24 +163,15 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
>
> return pd;
> }
> -#else
> -static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
> - struct device *dev)
> -{
> - return 0;
> -}
> -#endif
>
> static inline int max8997_i2c_get_driver_data(struct i2c_client *i2c,
> const struct i2c_device_id *id)
> {
> -#ifdef CONFIG_OF
> - if (i2c->dev.of_node) {
> + if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
> const struct of_device_id *match;
> match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
> return (int)match->data;
> }
> -#endif
> return (int)id->driver_data;
> }
>
> @@ -203,7 +193,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
> max8997->type = max8997_i2c_get_driver_data(i2c, id);
> max8997->irq = i2c->irq;
>
> - if (max8997->dev->of_node) {
> + if (IS_ENABLED(CONFIG_OF) && max8997->dev->of_node) {
> pdata = max8997_i2c_parse_dt_pdata(max8997->dev);
> if (IS_ERR(pdata))
> return PTR_ERR(pdata);
Gentle ping.
Please let me know, Are there any review comments on this patch?
Regards
Manish Badarkhe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-06 10:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-22 17:48 [PATCH] mfd: max8997: Use "IS_ENABLED(CONFIG_OF)" for DT code Manish Badarkhe
2014-01-05 8:10 ` Manish Badarkhe
2014-01-06 10:51 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).