max8925_power: Use "IS_ENABLED(CONFIG_OF)" for DT code.
PATCH v3 1/1 max8925_power: Use "IS_ENABLED(CONFIG_OF)" for DT code.
Instead of "#ifdef CONFIG_OF" use "IS_ENABLED(CONFIG_OF)" option for DT code to avoid if-deffery in code.
---
:100644 100644 b4513f2... 3e54476... M drivers/power/max8925_power.c
drivers/power/max8925_power.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
drivers/power/max8925_power.c +5 -12
@@ -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) {
@@ -440,9 +439,6 @@ max8925_power_dt_init(struct platform_device *pdev)int no_insert_detect;struct max8925_power_pdata *pdata; -if (!nproot) -return pdev->dev.platform_data; - np =of_find_node_by_name (nproot,"charger" );if (!np) {dev_err (&pdev->dev,"failed to find charger node\n" );
@@ -468,13 +464,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 +472,11 @@ static int max8925_power_probe(struct platform_device *pdev)struct max8925_power_info *info;int ret; - pdata =max8925_power_dt_init (pdev); + pdata =dev_get_platdata (&pdev->dev); + +if (!pdata && chip->dev->of_node) + pdata =max8925_power_dt_init (pdev); +if (!pdata) {dev_err (&pdev->dev,"platform data isn't assigned to " "power supply\n" );
Signature · 1 line
1.7.10.4
Hi,
Quoted 46 lines · Manish Badarkhe
Instead of "#ifdef
CONFIG_OF" use "IS_ENABLED(CONFIG_OF)" option for DT code to avoid if-deffery in code.Signed-off-by Manish Badarkhe <[email protected]>---
:100644 100644 b4513f2... 3e54476... Mdrivers/power/max8925_power.cdrivers/power/max8925_power.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)drivers/power/max8925_power.c +0
-11@@ -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) {@@ -440,9 +439,6 @@ max8925_power_dt_init(struct platform_device *pdev)int no_insert_detect;struct max8925_power_pdata *pdata; -if (!nproot) -return pdev->dev.platform_data; - np =of_find_node_by_name (nproot,"charger" );if (!np) {dev_err (&pdev->dev,"failed to find charger node\n" );@@ -468,13 +464,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) {
drivers/power/max8925_power.c static int max8925_power_probe(struct platform_device *pdev) · line 477
Quoted 7 lines
drivers/power/max8925_power.c +3
-1@@ -483,7 +472,11 @@ static int max8925_power_probe(struct platform_device *pdev)struct max8925_power_info *info;int ret; - pdata =max8925_power_dt_init (pdev); + pdata =dev_get_platdata (&pdev->dev); + +if (!pdata && chip->dev->of_node)
Shouldn't IS_ENABLED(CONFIG_OF) also be checked here to let the compiler throw max8925_power_dt_init() away if the condition always evaluates to false?
Best regards,
Tomasz
Hi Tomasz,
Quoted 56 lines · Tomasz Figa
Hi,
Quoted 52 lines · Manish Badarkhe
Instead of "#ifdef
CONFIG_OF" use "IS_ENABLED(CONFIG_OF)" option for DT code to avoid if-deffery in code.Signed-off-by Manish Badarkhe <[email protected]>---
:100644 100644 b4513f2... 3e54476... Mdrivers/power/max8925_power.cdrivers/power/max8925_power.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)drivers/power/max8925_power.c +0
-1@@ -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){drivers/power/max8925_power.c +0
-10@@ -440,9 +439,6 @@ max8925_power_dt_init(struct platform_device *pdev)int no_insert_detect;struct max8925_power_pdata *pdata; -if (!nproot) -return pdev->dev.platform_data; - np =of_find_node_by_name (nproot,"charger" );if (!np) {dev_err (&pdev->dev,"failed to find charger node\n" );@@ -468,13 +464,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 +472,11 @@ static int max8925_power_probe(struct platform_device *pdev)struct max8925_power_info *info;int ret;
Quoted 9 lines
drivers/power/max8925_power.c static int max8925_power_probe(struct platform_device *pdev) · line 477
Quoted 4 lines
drivers/power/max8925_power.c +3
-1- pdata =max8925_power_dt_init (pdev); + pdata =dev_get_platdata (&pdev->dev); + +if (!pdata && chip->dev->of_node)Shouldn't
IS_ENABLED(CONFIG_OF)also be checked here to let the compiler throwmax8925_power_dt_init()away if the condition always evaluates to false?
oops, I missed that. I will add it and repost patch.
Thanks
Manish Badarkhe