Messages in this thread | | | Date | Sun, 26 Jan 2014 14:22:44 +0100 | From | Tomasz Figa <> | Subject | Re: [PATCH] max8925_power: Use "IS_ENABLED(CONFIG_OF)" for DT code. |
| |
Hi Manish,
On 26.01.2014 08:15, Manish Badarkhe 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 b4513f2... d353fbc... M drivers/power/max8925_power.c > drivers/power/max8925_power.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c > index b4513f2..d353fbc 100644 > --- a/drivers/power/max8925_power.c > +++ b/drivers/power/max8925_power.c > @@ -427,7 +427,6 @@ static int max8925_deinit_charger(struct max8925_power_info *info) > return 0; > } > > -#ifdef CONFIG_OF > static struct max8925_power_pdata * > max8925_power_dt_init(struct platform_device *pdev) > { > @@ -468,13 +467,6 @@ max8925_power_dt_init(struct platform_device *pdev) > > return pdata; > } > -#else > -static struct max8925_power_pdata * > -max8925_power_dt_init(struct platform_device *pdev) > -{ > - return pdev->dev.platform_data; > -} > -#endif > > static int max8925_power_probe(struct platform_device *pdev) > { > @@ -483,7 +475,11 @@ static int max8925_power_probe(struct platform_device *pdev) > struct max8925_power_info *info; > int ret; > > - pdata = max8925_power_dt_init(pdev); > + if (IS_ENABLED(CONFIG_OF)) > + pdata = max8925_power_dt_init(pdev); > + else > + pdata = pdev->dev.platform_data; > +
This does not look much better than before this patch. Instead of "if-deffery" outside function bodies you are adding "iffery" (if there is such a word) inside a function.
What about adding
if (!IS_ENABLED(CONFIG_OF)) return pdev->dev.platform_data;
on top of max8925_power_dt_init() instead or maybe also renaming this function to max8925_get_pdata()?
Best regards, Tomasz
| |