max8925_power: Use "IS_ENABLED(CONFIG_OF)" for DT code.
Subsystems (2)
PATCH v2 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.
Signed-off-by Manish Badarkhe <[email protected]>
---
Changes since V1:
1. update code to retrieve platform/dt data in same function
:100644 100644 b4513f2... 20a7100... M drivers/power/max8925_power.c
drivers/power/max8925_power.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/power/max8925_power.c +4 -11
@@ -427,9 +427,8 @@ 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) +max8925_get_data (struct platform_device *pdev) {struct device_node *nproot = pdev->dev.parent->of_node;struct device_node *np;
@@ -440,7 +439,7 @@ max8925_power_dt_init(struct platform_device *pdev)int no_insert_detect;struct max8925_power_pdata *pdata; -if (!nproot) +if (!IS_ENABLED (CONFIG_OF ) || !nproot)return pdev->dev.platform_data; np =of_find_node_by_name (nproot,"charger" );
@@ -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,8 @@ static int max8925_power_probe(struct platform_device *pdev)struct max8925_power_info *info;int ret; - pdata =max8925_power_dt_init (pdev); + pdata =max8925_get_data (pdev); +if (!pdata) {dev_err (&pdev->dev,"platform data isn't assigned to " "power supply\n" );
Signature · 1 line
1.7.10.4