From patchwork Tue Dec 24 14:14:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3404471 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 EB59A9F375 for ; Tue, 24 Dec 2013 16:24:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A97E2055D for ; Tue, 24 Dec 2013 16:24:09 +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 3C72B20557 for ; Tue, 24 Dec 2013 16:24:08 +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 1VvSr5-0005V6-GV; Tue, 24 Dec 2013 14:21:09 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VvSqR-0005mn-A1; Tue, 24 Dec 2013 14:20:27 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VvSlz-00059V-1A for linux-arm-kernel@lists.infradead.org; Tue, 24 Dec 2013 14:15:51 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MYB00D5ZE97FE60@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 24 Dec 2013 14:15:07 +0000 (GMT) X-AuditID: cbfec7f4-b7f796d000005a13-c9-52b996ec0f5d Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id A6.19.23059.CE699B25; Tue, 24 Dec 2013 14:15:08 +0000 (GMT) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MYB00MNYE90WR00@eusync2.samsung.com>; Tue, 24 Dec 2013 14:15:08 +0000 (GMT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH RFC 07/11] ARM: SAMSUNG: pm: Move s3c_pm_check_* prototypes to plat/pm-common.h Date: Tue, 24 Dec 2013 15:14:30 +0100 Message-id: <1387894474-14428-7-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.4.3 In-reply-to: <1387894474-14428-1-git-send-email-t.figa@samsung.com> References: <1387894474-14428-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAJMWRmVeSWpSXmKPExsVy+t/xK7pvpu0MMvjxXNXi76Rj7Ba9C66y WWx6fI3VYsb5fUwWp65/ZrNYP+M1iwObx+9fkxg9Ni+p97hyoonVo2/LKkaPz5vkAlijuGxS UnMyy1KL9O0SuDL+7X3AXLBGtOLBY4UGxmVCXYycHBICJhIb569jhLDFJC7cW8/WxcjFISSw lFFi/4IFLBBOH5PE6RVnwarYBNQkPjc8YgOxRQRUJT63LWAHKWIW2MQo8Xn3YVaQhLBAosSk J1eYQGwWoKL5u2azg9i8Ak4SaxbOh1qnING55j+YzSngLHH102WwGiGgms+XXjNPYORdwMiw ilE0tTS5oDgpPddQrzgxt7g0L10vOT93EyMklL7sYFx8zOoQowAHoxIPb0HpjiAh1sSy4src Q4wSHMxKIrxXFHcGCfGmJFZWpRblxxeV5qQWH2Jk4uCUamDkD/v6/CbvxasCgs/6/X4YfzPp XB37PP3Ii1+7GPmmXrk0h4Fp9/zv0alxx19GzD8eP1NN4U/bNOeJgUu+8XsEnmB+Oe1lhBXD ipnrDrEtOsx4M0bJKPSl0Y/jX3SVuKbs35vHctY4NDQgajrHL4+DT7JOPCkuEDFeujU2s2+y ut8aprhjBeftlViKMxINtZiLihMB7DziVAMCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131224_091551_192976_BF9B42D9 X-CRM114-Status: GOOD ( 10.25 ) X-Spam-Score: -7.5 (-------) Cc: Olof Johansson , Tomasz Figa , Kukjin Kim , Arnd Bergmann , 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.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 To allow using Samsung PM memory check helpers on platforms that do not use the legacy Samsung PM core, this patch moves prototypes of relevant functions to plat/pm-common.h header. Signed-off-by: Tomasz Figa --- arch/arm/plat-samsung/include/plat/pm-common.h | 14 ++++++++++++++ arch/arm/plat-samsung/include/plat/pm.h | 14 -------------- arch/arm/plat-samsung/pm-check.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/plat-samsung/include/plat/pm-common.h b/arch/arm/plat-samsung/include/plat/pm-common.h index 2268db6..997b10a 100644 --- a/arch/arm/plat-samsung/include/plat/pm-common.h +++ b/arch/arm/plat-samsung/include/plat/pm-common.h @@ -93,4 +93,18 @@ static inline void s3c_pm_save_uarts(void) { } static inline void s3c_pm_restore_uarts(void) { } #endif +/* suspend memory checking */ + +#ifdef CONFIG_SAMSUNG_PM_CHECK +extern void s3c_pm_check_prepare(void); +extern void s3c_pm_check_restore(void); +extern void s3c_pm_check_cleanup(void); +extern void s3c_pm_check_store(void); +#else +#define s3c_pm_check_prepare() do { } while(0) +#define s3c_pm_check_restore() do { } while(0) +#define s3c_pm_check_cleanup() do { } while(0) +#define s3c_pm_check_store() do { } while(0) +#endif + #endif diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h index 4099e8d..e17d871 100644 --- a/arch/arm/plat-samsung/include/plat/pm.h +++ b/arch/arm/plat-samsung/include/plat/pm.h @@ -80,20 +80,6 @@ extern void s3c_pm_debug_smdkled(u32 set, u32 clear); static inline void s3c_pm_debug_smdkled(u32 set, u32 clear) { } #endif /* CONFIG_S3C_PM_DEBUG_LED_SMDK */ -/* suspend memory checking */ - -#ifdef CONFIG_SAMSUNG_PM_CHECK -extern void s3c_pm_check_prepare(void); -extern void s3c_pm_check_restore(void); -extern void s3c_pm_check_cleanup(void); -extern void s3c_pm_check_store(void); -#else -#define s3c_pm_check_prepare() do { } while(0) -#define s3c_pm_check_restore() do { } while(0) -#define s3c_pm_check_cleanup() do { } while(0) -#define s3c_pm_check_store() do { } while(0) -#endif - /** * s3c_pm_configure_extint() - ensure pins are correctly set for IRQ * diff --git a/arch/arm/plat-samsung/pm-check.c b/arch/arm/plat-samsung/pm-check.c index 3cbd626..04aff2c 100644 --- a/arch/arm/plat-samsung/pm-check.c +++ b/arch/arm/plat-samsung/pm-check.c @@ -19,7 +19,7 @@ #include #include -#include +#include #if CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE < 1 #error CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE must be a positive non-zero value