From patchwork Fri Dec 20 21:25:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 3391981 Return-Path: X-Original-To: patchwork-linux-arm@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 1CF9B9F344 for ; Fri, 20 Dec 2013 21:27:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D66F320708 for ; Fri, 20 Dec 2013 21:27:34 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA140206FF for ; Fri, 20 Dec 2013 21:27:29 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vu7as-00027d-PZ; Fri, 20 Dec 2013 21:26:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vu7ah-0000EO-Qk; Fri, 20 Dec 2013 21:26:39 +0000 Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vu7aV-0000Cx-UJ for linux-arm-kernel@lists.infradead.org; Fri, 20 Dec 2013 21:26:32 +0000 Received: by mail-we0-f170.google.com with SMTP id w61so3057656wes.1 for ; Fri, 20 Dec 2013 13:26:06 -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=5oaWICE2+yeWIcCw+fw6FMVbtQ1l62LHcJZj+0YUXHY=; b=Y0KohXAVjZZrtAysxeOL5AsSwx0OvJogZE5VYITcWsuZGh6V9t6v5Y8qotB4EYK9mZ r1HkEn9tOL0R2xez+CMMa4tLbc54ZsznP/NCf+G9323ST1zh6FhgnlRgJBwQfnAw2QXb LhL25W32mlyS/1YN4Cc5MS0rncbCH84z+a4FvqLrWHD33y0K4JT8mXPqFXGbiOnrRSCW KMATTcbuiqfN+lVBggalVcnxWdplKopNanVnQ7ayF8zvwRoFhtS5f9VZmUX0tdlDqZ/6 dlB3/oTjfGCRh9O8Hj1GrmapUarnAQ3IuytRl+TFLyodJZKayq0ZFGCCdI7C9jXfTak3 evMQ== X-Received: by 10.181.13.166 with SMTP id ez6mr9682046wid.1.1387574766045; Fri, 20 Dec 2013 13:26:06 -0800 (PST) Received: from localhost.localdomain (093105185086.warszawa.vectranet.pl. [93.105.185.86]) by mx.google.com with ESMTPSA id j3sm16590945wiy.3.2013.12.20.13.26.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 20 Dec 2013 13:26:05 -0800 (PST) From: Sylwester Nawrocki To: kgene.kim@samsung.com Subject: [PATCH] ARM: EXYNOS: Kill exynos_pm_late_initcall() Date: Fri, 20 Dec 2013 22:25:58 +0100 Message-Id: <1387574758-28489-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131220_162628_162294_A0D0DFD4 X-CRM114-Status: GOOD ( 10.98 ) X-Spam-Score: -2.0 (--) Cc: linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 only thing exynos_pm_late_initcall() does is calling pm_genpd_poweroff_unused(), which is already stubbed when CONFIG_PM_GENERIC_DOMAINS is not enabled. So replace exynos_pm_late_initcall() with a direct call to pm_genpd_poweroff_unused(). Signed-off-by: Sylwester Nawrocki --- arch/arm/mach-exynos/common.c | 3 ++- arch/arm/mach-exynos/common.h | 6 ------ arch/arm/mach-exynos/pm_domains.c | 6 ------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 8ae4797..09e6898 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -324,7 +325,7 @@ void __init exynos_init_late(void) /* to be supported later */ return; - exynos_pm_late_initcall(); + pm_genpd_poweroff_unused(); } static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname, diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index ff9b6a9..0c31b34 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -26,12 +26,6 @@ void exynos_init_late(void); void exynos_firmware_init(void); -#ifdef CONFIG_PM_GENERIC_DOMAINS -int exynos_pm_late_initcall(void); -#else -static inline int exynos_pm_late_initcall(void) { return 0; } -#endif - extern struct smp_operations exynos_smp_ops; extern void exynos_cpu_die(unsigned int cpu); diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index ff50836..8fd2488 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -184,9 +184,3 @@ static __init int exynos4_pm_init_power_domain(void) return 0; } arch_initcall(exynos4_pm_init_power_domain); - -int __init exynos_pm_late_initcall(void) -{ - pm_genpd_poweroff_unused(); - return 0; -}