From patchwork Wed Mar 11 11:08:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 5983531 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 177B59F318 for ; Wed, 11 Mar 2015 11:11:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3830720395 for ; Wed, 11 Mar 2015 11:11:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 5910820394 for ; Wed, 11 Mar 2015 11:11:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVeWJ-0003B6-Im; Wed, 11 Mar 2015 11:09:47 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVeVo-0002wM-7a for linux-arm-kernel@lists.infradead.org; Wed, 11 Mar 2015 11:09:17 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NL100DRBOHJG220@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 11 Mar 2015 11:12:55 +0000 (GMT) X-AuditID: cbfec7f4-b7f126d000001e9a-44-550021b06a3e Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id DF.F2.07834.0B120055; Wed, 11 Mar 2015 11:06:24 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NL100G66OAL9560@eusync2.samsung.com>; Wed, 11 Mar 2015 11:08:49 +0000 (GMT) From: Krzysztof Kozlowski To: Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] ARM: EXYNOS: Remove left over 'extra_save' Date: Wed, 11 Mar 2015 12:08:41 +0100 Message-id: <1426072121-6822-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1426072121-6822-1-git-send-email-k.kozlowski@samsung.com> References: <1426072121-6822-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphluLIzCtJLcpLzFFi42I5/e/4Fd0NigyhBvf3S1r8nXSM3eL1C0OL /sevmS02Pb7GanF51xw2ixnn9zFZrD1yl93i1PXPbBaLtn5hd+D0+P1rEqPHplWdbB6bl9R7 XDnRxOrRt2UVo8fnTXIBbFFcNimpOZllqUX6dglcGY1vFzMWTBau2Lz/M0sD433+LkZODgkB E4lrC1+zQ9hiEhfurWfrYuTiEBJYyigxr+cMM4TTxySxqG8yWBWbgLHE5uVLwKpEBLoYJWZt +c0GkmAWOMsoMWmFO4gtLOAk8W7hLLAGFgFViRt7jzOB2LwCbhJPZ8xihlgnJ3Hy2GRWEJtT wF2ic+MmsBohoJrW798ZJzDyLmBkWMUomlqaXFCclJ5rqFecmFtcmpeul5yfu4kREnJfdjAu PmZ1iFGAg1GJh/dm9L8QIdbEsuLK3EOMEhzMSiK8ffwMoUK8KYmVValF+fFFpTmpxYcYmTg4 pRoY02XUGBzOKxxMPRW+VSdtvaRtP+tpIwfN35925muzTDnd/rr7drXs3hL/8k0GkxLYpP9c vra8LPu2U+YD1w2iptEeM5c1BX1sizlip9J93f+Gw//+44+9ZEUmBTc8NHzyZ1akXZ7Sk5pg pVS2CZ725z/9+rFq/h7z4zeE6/O2Fj7Ndw2b0JqlxFKckWioxVxUnAgAeUa7tBcCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150311_040916_452673_D2876943 X-CRM114-Status: GOOD ( 11.80 ) X-Spam-Score: -5.0 (-----) Cc: Olof Johansson , Pankaj Dubey , Krzysztof Kozlowski , Arnd Bergmann , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Since 32b0aa9aaeb4 ("ARM: EXYNOS: Remove i2c sys configuration related code") the Exynos 5250 no longer saves additional registers under 'exynos_pm_data.extra_save' field. No one else uses this code so get rid of it making also 'exynos_pm_data' const everywhere. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Pankaj Dubey --- Notes: Changes since v3: 1. Add Pankaj's reviewed-by. Changes since v2: 1. Remove also 'num_extra_save' field (suggested by Pankaj Dubey). Changes since v1: 1. New patch. arch/arm/mach-exynos/suspend.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index d42fb1cd202d..6e5a3355ae81 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -63,8 +63,6 @@ static struct sleep_save exynos_core_save[] = { struct exynos_pm_data { const struct exynos_wkup_irq *wkup_irq; - struct sleep_save *extra_save; - int num_extra_save; unsigned int wake_disable_mask; unsigned int *release_ret_regs; @@ -75,7 +73,7 @@ struct exynos_pm_data { int (*cpu_suspend)(unsigned long); }; -static struct exynos_pm_data *pm_data; +static const struct exynos_pm_data *pm_data; static int exynos5420_cpu_state; static unsigned int exynos_pmu_spare3; @@ -240,10 +238,6 @@ static void exynos_pm_prepare(void) s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save)); - if (pm_data->extra_save) - s3c_pm_do_save(pm_data->extra_save, - pm_data->num_extra_save); - exynos_pm_enter_sleep_mode(); /* ensure at least INFORM0 has the resume address */ @@ -366,10 +360,6 @@ static void exynos_pm_resume(void) /* For release retention */ exynos_pm_release_retention(); - if (pm_data->extra_save) - s3c_pm_do_restore_core(pm_data->extra_save, - pm_data->num_extra_save); - s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save)); if (cpuid == ARM_CPU_PART_CORTEX_A9) @@ -622,7 +612,7 @@ void __init exynos_pm_init(void) pr_err("Failed to find PMU node\n"); return; } - pm_data = (struct exynos_pm_data *) match->data; + pm_data = (const struct exynos_pm_data *) match->data; /* Platform-specific GIC callback */ gic_arch_extn.irq_set_wake = exynos_irq_set_wake;