| Message ID | 1422961601-7087-3-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Krzysztof, On Tuesday 03 February 2015 04:36 PM, Krzysztof Kozlowski wrote: > 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 <k.kozlowski@samsung.com> > > --- > 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; 'num_extra_save' can be removed at the same time. Rest changes looks ok. Thanks, Pankaj Dubey -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On czw, 2015-02-05 at 10:19 +0530, Pankaj Dubey wrote: > Hi Krzysztof, > > On Tuesday 03 February 2015 04:36 PM, Krzysztof Kozlowski wrote: > > 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 <k.kozlowski@samsung.com> > > > > --- > > 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; > > 'num_extra_save' can be removed at the same time. > > Rest changes looks ok. Right, thanks for pointing this out. I'll resend the patchset. Best regards, Krzysztof > > Thanks, > Pankaj Dubey -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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 <k.kozlowski@samsung.com> --- Changes since v1: 1. New patch. --- arch/arm/mach-exynos/suspend.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)