From patchwork Thu Feb 5 07:23:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 5782571 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 09A879F302 for ; Thu, 5 Feb 2015 07:24:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32923201E4 for ; Thu, 5 Feb 2015 07:24:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AAB6202C8 for ; Thu, 5 Feb 2015 07:24:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756530AbbBEHYM (ORCPT ); Thu, 5 Feb 2015 02:24:12 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:49855 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755803AbbBEHXl (ORCPT ); Thu, 5 Feb 2015 02:23:41 -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 <0NJA00CCEFE60490@mailout2.w1.samsung.com>; Thu, 05 Feb 2015 07:27:42 +0000 (GMT) X-AuditID: cbfec7f5-b7fc86d0000066b7-8e-54d319e8cb64 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 49.DE.26295.8E913D45; Thu, 05 Feb 2015 07:21:12 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NJA00HC4F78PT10@eusync3.samsung.com>; Thu, 05 Feb 2015 07:23:38 +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: Pankaj Dubey , Bartlomiej Zolnierkiewicz , Marek Szyprowski , Krzysztof Kozlowski Subject: [PATCH v3 3/3] ARM: EXYNOS: Remove left over 'extra_save' Date: Thu, 05 Feb 2015 08:23:22 +0100 Message-id: <1423121002-25117-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1423121002-25117-1-git-send-email-k.kozlowski@samsung.com> References: <1423121002-25117-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHJMWRmVeSWpSXmKPExsVy+t/xq7ovJC+HGNw7J2uxccZ6VovXLwwt +h+/ZrbY9Pgaq8XlXXPYLGac38dkcfsyr8XaI3fZLRZt/cLuwOnR0tzD5rFpVSebx+Yl9R59 W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CVMffjTtaCVqGKWd+6GRsYm/m7GDk5JARMJHa1/GOB sMUkLtxbz9bFyMUhJLCUUeLQ/BesEE4fk8Tq5fvZQKrYBIwlNi9fAlYlIrCZUaK/cTdYFbPA YUaJvu/zwGYJCzhJvL+3HCjBwcEioCrx4rAESJhXwF2id8VfqHVyEiePTWYFsTkFPCT+3l3I DGILAdVMOb+KbQIj7wJGhlWMoqmlyQXFSem5RnrFibnFpXnpesn5uZsYIWH2dQfj0mNWhxgF OBiVeHg7ei+GCLEmlhVX5h5ilOBgVhLh1eS4HCLEm5JYWZValB9fVJqTWnyIkYmDU6qBUW56 ef/P5B3pb897fqksqVzgKNrskXZ2lXT7abXOZKaiEJ0VR3zi2JNfHlrLYrzX4KmThrn49Ji4 5W9aF8j1pwTONn5tmeqavvrv1CaNr96xa8KrDCXOLeApu91xb0Xt55enlwc7ZFr/4I659O3/ xEfOihY389KX3l53sL/I8MiyiPMcGuyvlFiKMxINtZiLihMBV5MF5hECAAA= 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 Reviewed-by: Pankaj Dubey --- Changes since v2: 2. 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 e6c961126087..71e2ba6dbc3d 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 */ @@ -362,10 +356,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 +608,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;