From patchwork Sun Jan 26 07:15:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Badarkhe X-Patchwork-Id: 3539551 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7AC9B9F39E for ; Sun, 26 Jan 2014 07:16:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8177F2013D for ; Sun, 26 Jan 2014 07:16:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0D5E20154 for ; Sun, 26 Jan 2014 07:16:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751565AbaAZHPz (ORCPT ); Sun, 26 Jan 2014 02:15:55 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:50066 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751174AbaAZHPy (ORCPT ); Sun, 26 Jan 2014 02:15:54 -0500 Received: by mail-pa0-f42.google.com with SMTP id kl14so4790846pab.29 for ; Sat, 25 Jan 2014 23:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=NjGRs+BaFrTovdV96qR1Q99PD+c5xNqN0x2jKssgJEs=; b=DH+9quAl/Zuc1u444LjHIklfwTGRmLVk28zy5YsUrzTmD2zRoc/vDRXjhJUSkQjIZd VNPAJOYiMbrGOsvBrjL/NB7e2M4pC0pSSE7oX3a9HapLpX++QEHg6wR4yIDH5BFdevzd C9hIUXUpH3noMzNXC1FHZRpitpPT3cLIuVDau431umURIHeeOdWYhjd1tcQzwcfmH0/0 KH5hp6pgFafcjcTc1zVccYIwcFQO9tU3Rl6GgZtIcpGVddWt12wv/R60IXKu3viXjL03 6MKJv2fGPAU2/cWpbrcKZAGiCwqDfviXJqs93rsJPfXtAX5khyQS0rqkyHbp09PKMWPW GnkA== X-Received: by 10.66.26.176 with SMTP id m16mr1269509pag.142.1390720554214; Sat, 25 Jan 2014 23:15:54 -0800 (PST) Received: from manish-HP-Pavilion-dv4-Notebook-PC.connectify ([113.193.146.227]) by mx.google.com with ESMTPSA id sx8sm52520118pab.5.2014.01.25.23.15.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 25 Jan 2014 23:15:53 -0800 (PST) From: Manish Badarkhe To: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: dbaryshkov@gmail.com, dwmw2@infradead.org, badarkhe.manish@gmail.com Subject: [PATCH] max8925_power: Use "IS_ENABLED(CONFIG_OF)" for DT code. Date: Sun, 26 Jan 2014 12:45:40 +0530 Message-Id: <1390720540-13350-1-git-send-email-badarkhe.manish@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- :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");