From patchwork Fri Apr 11 10:40:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 3967601 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 89B4EC0DA2 for ; Fri, 11 Apr 2014 10:40:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE055207F3 for ; Fri, 11 Apr 2014 10:40:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2B77207EF for ; Fri, 11 Apr 2014 10:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757195AbaDKKkX (ORCPT ); Fri, 11 Apr 2014 06:40:23 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:50683 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756766AbaDKKkL (ORCPT ); Fri, 11 Apr 2014 06:40:11 -0400 Received: by mail-we0-f171.google.com with SMTP id t61so5201102wes.16 for ; Fri, 11 Apr 2014 03:40:10 -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=rQ3QwQeWywo2Th1js2dHUQCHhWy9Ml9Z0muEbYU/cxw=; b=O2W7HkBKKEYsucxE0r0LlAUvKNSuqvEQ9Wyq1/nM+1MlVJya+ZqPCqsHTEy7St9sTj XdT7d66FDq5o4FZf1hfiC7TQsTlpH1qf1Ird71ISyjs5jfJwpeVRlaS2koj1Gb3Odgxy tkvWP9TZDL0knvFzRwpq44ObEoqNdnf7X+hMUahOVTmg5pPfoMmy0FHqcRtVV9YByioI IjMrEsMhiafqlo7aeu+SRw6fvx59gpuke9OlQXgPoehKQDcy2F8ujjx1YcGf1I61R3At BzWGlu6cd9uTxyFBZ44DPYdIcHoyf95qRJAsHfetkfteVLMi1gK5ZDOXiF7qJ7Rq7paK n54Q== X-Gm-Message-State: ALoCoQnFbLyzxksu9R4DEdcubDZ85YBPslbymN0rYmxINRWOIqitWYN+jPhrZI0GMh456et6HxIv X-Received: by 10.194.77.50 with SMTP id p18mr1338723wjw.68.1397212810290; Fri, 11 Apr 2014 03:40:10 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-377-242.w86-199.abo.wanadoo.fr. [86.199.232.242]) by mx.google.com with ESMTPSA id eq8sm3683033wib.16.2014.04.11.03.40.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 03:40:09 -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, rjw@rjwysocki.net Subject: [PATCH V5 10/20] ARM: exynos: cpuidle: Remove ifdef for scu_enable Date: Fri, 11 Apr 2014 12:40:05 +0200 Message-Id: <1397212815-16068-11-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397212815-16068-1-git-send-email-daniel.lezcano@linaro.org> References: <1397212815-16068-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.3 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 Reviewed-by: Tomasz Figa --- 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;