From patchwork Tue Apr 8 12:19:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 3948431 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 755809F369 for ; Tue, 8 Apr 2014 12:19:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65D012037E for ; Tue, 8 Apr 2014 12:19:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 331BC203AF for ; Tue, 8 Apr 2014 12:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756662AbaDHMTm (ORCPT ); Tue, 8 Apr 2014 08:19:42 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:43822 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756636AbaDHMTk (ORCPT ); Tue, 8 Apr 2014 08:19:40 -0400 Received: by mail-wg0-f48.google.com with SMTP id l18so842244wgh.31 for ; Tue, 08 Apr 2014 05:19:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ma0vIjgZwk7lmwOSQIBWReRa8xQE6oXPpJ5Tf6HB9EE=; b=lVOJu25RkLzXY3PTNOohFiTa7THEBldwjtSoLF5BmcJ9L0Mc4BfpFoUK/vB26P2Y/s 1QhKVj1e3He63b5Vk6KZQWvFhm3Q6ji5Evxh1cDs3KyoaReXh46jm3BMdCG6QUdFqBp/ cczf3n8S3YRj2JGixQCG8Q0RRK2a/a5ntlqEsAr+mijGtVPusKDppNZubKB6/g9Zpt4G DokgyBWLqcnulmMsqTTL75BITtirJmbt/uW0Qu8zXM0hXZu4f+QOWZtI+TKi82YheqFv /K6z6KOTUDBvKZrmyTcFk/CKxeNbTGr/oQlurTdwAJc0V++v098keWUet7u3ZtfLNB5l Q65Q== X-Gm-Message-State: ALoCoQmSIOWwN7O3WWJVOb0oZxs0VIDZ7L5oMncC1/h3kPw4L5ZZy6AVO0alAIxxnFNs1P14JA5E X-Received: by 10.194.104.197 with SMTP id gg5mr3658681wjb.26.1396959579638; Tue, 08 Apr 2014 05:19:39 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-451-172.w83-205.abo.wanadoo.fr. [83.205.74.172]) by mx.google.com with ESMTPSA id u1sm3000063wjx.16.2014.04.08.05.19.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 05:19:39 -0700 (PDT) From: Daniel Lezcano To: kgene.kim@samsung.com Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, t.figa@samsung.com, linaro-kernel@lists.linaro.org, b.zolnierkie@samsung.com, sachin.kamat@linaro.org, viresh.kumar@linaro.org, rjw@rjwysocki.net Subject: [PATCH V3 09/17] ARM: exynos: cpuidle: Remove ifdef for scu_enable Date: Tue, 8 Apr 2014 14:19:31 +0200 Message-Id: <1396959579-18268-10-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396959579-18268-1-git-send-email-daniel.lezcano@linaro.org> References: <1396959579-18268-1-git-send-email-daniel.lezcano@linaro.org> 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 The scu_enable function is already a noop in the scu's header file is CONFIG_SMP=n, so no need to use these macros in the code. Signed-off-by: Daniel Lezcano Reviewed-by: Viresh Kumar Reviewed-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/pm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index aba577f..9773a00 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -244,7 +244,7 @@ static void exynos_pm_resume(void) s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save)); - if (IS_ENABLED(CONFIG_SMP) && !soc_is_exynos5250()) + if (!soc_is_exynos5250()) scu_enable(S5P_VA_SCU); early_wakeup: @@ -336,10 +336,8 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, case CPU_PM_EXIT: if (cpu == 0) { -#ifdef CONFIG_SMP if (!soc_is_exynos5250()) scu_enable(S5P_VA_SCU); -#endif exynos_cpu_restore_register(); } break;