From patchwork Thu Nov 8 01:12:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 12735 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9733E23E3D for ; Thu, 8 Nov 2012 01:13:42 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4D4D1A18BFE for ; Thu, 8 Nov 2012 01:13:42 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3284280iej.11 for ; Wed, 07 Nov 2012 17:13:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:x-gm-message-state; bh=S5WpNRehemwqhxK7PXYA5Qxkqk6icUxZTWivwDNr6dI=; b=puZQ7JZjSPkj9PxI+sZlg39PaBplqawaiF1Jk9Qe122dlUWCezGIufSENYIJGjmgWZ PEGIcIedB+RgCfCRYs7X2A4DWEq4mjwU5RfSUOsMoA6qbkqvrZ9XpwoAFkTDFMAtVgu6 lpxd4HDj32+dV/rWZeOrvyUxBCuGrhn+1pxJoZNO1/12Yd5bMg3ra+zAiEdYSJiS/Fr4 8R9wxEB3NYGiaHj0wEawIlwsE7DWRJ1aBgsJmLbp7lWRaTTBsS7XtFBzfY6Yjl/B8Fip x9aNYx2NQWSqX1UIME/yBJoBQoxSCKtbVZVx1p9V6PAUN5/UBxIcgnDNspjen0W+E4xG bfcA== Received: by 10.50.237.69 with SMTP id va5mr3870141igc.62.1352337222078; Wed, 07 Nov 2012 17:13:42 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp304351igt; Wed, 7 Nov 2012 17:13:41 -0800 (PST) Received: by 10.60.12.65 with SMTP id w1mr3626563oeb.91.1352337221598; Wed, 07 Nov 2012 17:13:41 -0800 (PST) Received: from comal.ext.ti.com (comal.ext.ti.com. [198.47.26.152]) by mx.google.com with ESMTPS id rq9si8125329obc.200.2012.11.07.17.13.41 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 17:13:41 -0800 (PST) Received-SPF: pass (google.com: domain of mturquette@ti.com designates 198.47.26.152 as permitted sender) client-ip=198.47.26.152; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mturquette@ti.com designates 198.47.26.152 as permitted sender) smtp.mail=mturquette@ti.com Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id qA81Df68000776; Wed, 7 Nov 2012 19:13:41 -0600 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qA81DfMs003837; Wed, 7 Nov 2012 19:13:41 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Wed, 7 Nov 2012 19:13:41 -0600 Received: from nucleus.nsc.com (nucleus.nsc.com [10.188.36.112]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id qA81DPLh015450; Wed, 7 Nov 2012 19:13:40 -0600 From: Mike Turquette To: CC: , , , , Mike Turquette Subject: [PATCH 17/26] ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts Date: Wed, 7 Nov 2012 17:12:52 -0800 Message-ID: <1352337181-29427-18-git-send-email-mturquette@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352337181-29427-1-git-send-email-mturquette@ti.com> References: <1352337181-29427-1-git-send-email-mturquette@ti.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkkdhr92mLnalbd2AnqWnHpPOTfeAYfiWlj+5SIhJ4khjK4AgL61iRbgasXpInzcPOB/ORb From: Rajendra Nayak Clean all #ifdef's added as part of fixing the clkdm accesses from hwmod. Signed-off-by: Rajendra Nayak Signed-off-by: Mike Turquette --- arch/arm/mach-omap2/omap_hwmod.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 22a41f6..25052d6 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -130,11 +130,7 @@ #include #include #include -#ifdef CONFIG_COMMON_CLK #include -#else -#include -#endif #include #include #include @@ -623,17 +619,13 @@ static int _disable_wakeup(struct omap_hwmod *oh, u32 *v) struct clockdomain *_get_clkdm(struct omap_hwmod *oh) { + struct clk_hw_omap *clk; + if (oh->clkdm) { return oh->clkdm; } else if (oh->_clk) { -#ifdef CONFIG_COMMON_CLK - struct clk_hw_omap *clk; - clk = to_clk_hw_omap(__clk_get_hw(oh->_clk)); return clk->clkdm; -#else - return oh->_clk->clkdm; -#endif } return NULL; } @@ -3590,9 +3582,7 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh) struct clk *c; struct omap_hwmod_ocp_if *oi; struct clockdomain *clkdm; -#ifdef CONFIG_COMMON_CLK struct clk_hw_omap *clk; -#endif if (!oh) return NULL; @@ -3609,12 +3599,8 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh) c = oi->_clk; } -#ifdef CONFIG_COMMON_CLK clk = to_clk_hw_omap(__clk_get_hw(c)); clkdm = clk->clkdm; -#else - clkdm = c->clkdm; -#endif if (!clkdm) return NULL;