From patchwork Thu Feb 6 19:12:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3597961 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 156D49F382 for ; Thu, 6 Feb 2014 19:13:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4844720145 for ; Thu, 6 Feb 2014 19:13:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6252920120 for ; Thu, 6 Feb 2014 19:13:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756844AbaBFTNY (ORCPT ); Thu, 6 Feb 2014 14:13:24 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:62950 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756843AbaBFTNJ (ORCPT ); Thu, 6 Feb 2014 14:13:09 -0500 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) 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 <0N0L00KYZ9DS90A0@mailout2.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 06 Feb 2014 19:13:04 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-39-52f3dec4c013 Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 2F.74.18565.4CED3F25; Thu, 06 Feb 2014 19:13:08 +0000 (GMT) Received: from AMDC1227.digital.local ([106.116.147.199]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N0L002UD9DPUJ50@eusync4.samsung.com>; Thu, 06 Feb 2014 19:13:08 +0000 (GMT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Kukjin Kim , Arnd Bergmann , Doug Anderson , Olof Johansson , Kyungmin Park , Marek Szyprowski , Tomasz Figa Subject: [PATCH v2 08/12] ARM: SAMSUNG: pm: Move s3c_pm_check_* prototypes to plat/pm-common.h Date: Thu, 06 Feb 2014 20:12:53 +0100 Message-id: <1391713977-22300-9-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.5.2 In-reply-to: <1391713977-22300-1-git-send-email-t.figa@samsung.com> References: <1391713977-22300-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4Nd0j9z4HGXSuFbD4O+kYu8XZZQfZ LHoXXGWzONv0ht1i0+NrrBYzzu9jslh75C67xanrn9ks1s94zeLA6fH71yRGj9kNF1k8Ni+p 97hyoonVo2/LKkaPz5vkAtiiuGxSUnMyy1KL9O0SuDJezL/OUvBUtOLj1YvsDYzXhLoYOTkk BEwkLtxcygphi0lcuLeerYuRi0NIYCmjxIq335ggnD4miY8dj5hBqtgE1CQ+NzxiA7FFBFQl PrctYAexmQU2M0msOeIEYgsLJEh8XdvFCGKzANUsnbwVrJ5XwEni/enVLF2MHEDbFCRWXwc7 glPAWaJ9wg4mEFsIqOTu5XvsExh5FzAyrGIUTS1NLihOSs810itOzC0uzUvXS87P3cQICbiv OxiXHrM6xCjAwajEw6u44nOQEGtiWXFl7iFGCQ5mJRFe2ztAId6UxMqq1KL8+KLSnNTiQ4xM HJxSDYxa5VWx/a3JJ62uPhT6Mf82xze5Pcz3JJMT7z24Eq7dJHreaeGXQGG3u6oSzBM6wwK4 rgZqOwRFninT65J72bJ3haHH+ZtnyxPO86RsZZq8/Uxq5zktnrPGzy5v/3eMyyK5zlsx6NlE 9atvnVdOtX/RJzhbsm4H788ld7W2Z6RedrXh+//6WooSS3FGoqEWc1FxIgAhnLE6FgIAAA== 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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Acked-by: Kyungmin Park --- 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 741723e..8705f9e 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