lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 26 Jan 2014 12:45:40 +0530 From: Manish Badarkhe <badarkhe.manish@...il.com> To: linux-samsung-soc@...r.kernel.org, linux-kernel@...r.kernel.org Cc: dbaryshkov@...il.com, dwmw2@...radead.org, badarkhe.manish@...il.com Subject: [PATCH] max8925_power: Use "IS_ENABLED(CONFIG_OF)" for DT code. 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@...il.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; + if (!pdata) { dev_err(&pdev->dev, "platform data isn't assigned to " "power supply\n"); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists