From patchwork Tue Feb 3 11:06: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: 5767731 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 801D5BF440 for ; Tue, 3 Feb 2015 11:07:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADA88201F2 for ; Tue, 3 Feb 2015 11:07:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C94ED2013D for ; Tue, 3 Feb 2015 11:07:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933528AbbBCLH0 (ORCPT ); Tue, 3 Feb 2015 06:07:26 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:31905 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933270AbbBCLG4 (ORCPT ); Tue, 3 Feb 2015 06:06:56 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NJ700NWV0E93G80@mailout3.w1.samsung.com>; Tue, 03 Feb 2015 11:10:57 +0000 (GMT) X-AuditID: cbfec7f4-b7f126d000001e9a-1d-54d0ab3be286 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id DB.11.07834.B3BA0D45; Tue, 03 Feb 2015 11:04:27 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NJ700KZ707C4X10@eusync1.samsung.com>; Tue, 03 Feb 2015 11:06:52 +0000 (GMT) From: Krzysztof Kozlowski To: Russell King , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 3/3] ARM: EXYNOS: Remove left over 'extra_save' Date: Tue, 03 Feb 2015 12:06:41 +0100 Message-id: <1422961601-7087-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1422961601-7087-1-git-send-email-k.kozlowski@samsung.com> References: <1422961601-7087-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLJMWRmVeSWpSXmKPExsVy+t/xy7rWqy+EGDQ36Vq8fmFo0f/4NbPF psfXWC0u75rDZjHj/D4mi9uXeR3YPFqae9g8Nq3qZPPYvKTeo2/LKkaPz5vkAlijuGxSUnMy y1KL9O0SuDLmvL7OXLBCsGLvH6kGxh18XYycHBICJhLLTq1ihrDFJC7cW8/WxcjFISSwlFGi rfsPI4TTxyQx//hBNpAqNgFjic3Ll4BViQhsZpTob9zNCpJgFjCU+PnuDzuILSzgJPHlwA2g OAcHi4CqxK7nCSBhXgE3ifd3d7JBbJOTOHlsMlgrp4C7xLM9fUwgthBQzdkPPWwTGHkXMDKs YhRNLU0uKE5KzzXUK07MLS7NS9dLzs/dxAgJoi87GBcfszrEKMDBqMTDu8LoQogQa2JZcWXu IUYJDmYlEd705UAh3pTEyqrUovz4otKc1OJDjEwcnMAQKDUyW9abcO1vWW9yTKlG/bUote3H r8bWXhJ8LTpdlOfgvqtr9lzdIL7hY9m2neIdV5c7hedxyjB2nYp/vqvPcw7jzIqfa14qXYtX +G0vXxz3YmH44jblpo9Hj7O9Em+tsSotZb20J/karzmPcHbp166QeQKthftusft6s7hpNi3T Et5zQFlJiaU4I9FQi7moOBEAleWZlQACAAA= 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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 --- Changes since v1: 1. New patch. --- arch/arm/mach-exynos/suspend.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index e6c961126087..d56bd6ca5e86 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -63,7 +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 +74,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 +239,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 */ @@ -362,10 +357,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) @@ -618,7 +609,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;