suspend: constify platform_suspend_ops
authorLionel Debroux <lionel_debroux@yahoo.fr>
Tue, 16 Nov 2010 13:14:02 +0000 (14:14 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 16 Nov 2010 13:14:02 +0000 (14:14 +0100)
While at it, fix two checkpatch errors.
Several non-const struct instances constified by this patch were added after
the introduction of platform_suspend_ops in checkpatch.pl's list of "should
be const" structs (79404849e90a41ea2109bd0e2f7c7164b0c4ce73).

Patch against mainline.
Inspired by hunks of the grsecurity patch, updated for newer kernels.

Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
29 files changed:
arch/arm/mach-at91/pm.c
arch/arm/mach-davinci/pm.c
arch/arm/mach-imx/pm-imx27.c
arch/arm/mach-lpc32xx/pm.c
arch/arm/mach-omap1/pm.c
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/pm44xx.c
arch/arm/mach-pnx4008/pm.c
arch/arm/mach-pxa/pm.c
arch/arm/mach-pxa/sharpsl_pm.c
arch/arm/mach-sa1100/pm.c
arch/arm/plat-samsung/pm.c
arch/avr32/mach-at32ap/pm.c
arch/blackfin/mach-common/pm.c
arch/mips/alchemy/devboards/pm.c
arch/mips/jz4740/pm.c
arch/mips/loongson/common/pm.c
arch/powerpc/platforms/52xx/lite5200_pm.c
arch/powerpc/platforms/52xx/mpc52xx_pm.c
arch/powerpc/platforms/83xx/suspend.c
arch/powerpc/platforms/pseries/suspend.c
arch/powerpc/sysdev/fsl_pmc.c
arch/sh/boards/mach-hp6xx/pm.c
arch/sh/kernel/cpu/shmobile/pm.c
drivers/acpi/sleep.c
drivers/macintosh/via-pmu.c
include/linux/suspend.h
kernel/power/suspend.c

index dafbacc..ea53f4d 100644 (file)
@@ -301,7 +301,7 @@ static void at91_pm_end(void)
 }
 
 
-static struct platform_suspend_ops at91_pm_ops ={
+static const struct platform_suspend_ops at91_pm_ops = {
        .valid  = at91_pm_valid_state,
        .begin  = at91_pm_begin,
        .enter  = at91_pm_enter,
index fab953b..1bd73a0 100644 (file)
@@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_state_t state)
        return ret;
 }
 
-static struct platform_suspend_ops davinci_pm_ops = {
+static const struct platform_suspend_ops davinci_pm_ops = {
        .enter          = davinci_pm_enter,
        .valid          = suspend_valid_only_mem,
 };
index afc17ce..2153ca7 100644 (file)
@@ -32,7 +32,7 @@ static int mx27_suspend_enter(suspend_state_t state)
        return 0;
 }
 
-static struct platform_suspend_ops mx27_suspend_ops = {
+static const struct platform_suspend_ops mx27_suspend_ops = {
        .enter = mx27_suspend_enter,
        .valid = suspend_valid_only_mem,
 };
index a6e2aed..e76d41b 100644 (file)
@@ -123,7 +123,7 @@ static int lpc32xx_pm_enter(suspend_state_t state)
        return 0;
 }
 
-static struct platform_suspend_ops lpc32xx_pm_ops = {
+static const struct platform_suspend_ops lpc32xx_pm_ops = {
        .valid  = suspend_valid_only_mem,
        .enter  = lpc32xx_pm_enter,
 };
index b1d3f9f..4cf3b67 100644 (file)
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq = {
 
 
 
-static struct platform_suspend_ops omap_pm_ops ={
+static const struct platform_suspend_ops omap_pm_ops = {
        .prepare        = omap_pm_prepare,
        .enter          = omap_pm_enter,
        .finish         = omap_pm_finish,
index a40457d..aa9764e 100644 (file)
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
        enable_hlt();
 }
 
-static struct platform_suspend_ops omap_pm_ops = {
+static const struct platform_suspend_ops omap_pm_ops = {
        .prepare        = omap2_pm_prepare,
        .enter          = omap2_pm_enter,
        .finish         = omap2_pm_finish,
index 75c0cd1..4000c3c 100644 (file)
@@ -594,7 +594,7 @@ static void omap3_pm_end(void)
        return;
 }
 
-static struct platform_suspend_ops omap_pm_ops = {
+static const struct platform_suspend_ops omap_pm_ops = {
        .begin          = omap3_pm_begin,
        .end            = omap3_pm_end,
        .prepare        = omap3_pm_prepare,
index 54544b4..dc8b1ef 100644 (file)
@@ -75,7 +75,7 @@ static void omap4_pm_end(void)
        return;
 }
 
-static struct platform_suspend_ops omap_pm_ops = {
+static const struct platform_suspend_ops omap_pm_ops = {
        .begin          = omap4_pm_begin,
        .end            = omap4_pm_end,
        .prepare        = omap4_pm_prepare,
index ee3c29c..f3e60a0 100644 (file)
@@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_state_t state)
               (state == PM_SUSPEND_MEM);
 }
 
-static struct platform_suspend_ops pnx4008_pm_ops = {
+static const struct platform_suspend_ops pnx4008_pm_ops = {
        .enter = pnx4008_pm_enter,
        .valid = pnx4008_pm_valid,
 };
index 166c15f..978e1b2 100644 (file)
@@ -96,7 +96,7 @@ void pxa_pm_finish(void)
                pxa_cpu_pm_fns->finish();
 }
 
-static struct platform_suspend_ops pxa_pm_ops = {
+static const struct platform_suspend_ops pxa_pm_ops = {
        .valid          = pxa_pm_valid,
        .enter          = pxa_pm_enter,
        .prepare        = pxa_pm_prepare,
index 8fed027..02874e9 100644 (file)
@@ -868,7 +868,7 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
 }
 
 #ifdef CONFIG_PM
-static struct platform_suspend_ops sharpsl_pm_ops = {
+static const struct platform_suspend_ops sharpsl_pm_ops = {
        .prepare        = pxa_pm_prepare,
        .finish         = pxa_pm_finish,
        .enter          = corgi_pxa_pm_enter,
index c83fdc8..ab9fc44 100644 (file)
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
        return virt_to_phys(sp);
 }
 
-static struct platform_suspend_ops sa11x0_pm_ops = {
+static const struct platform_suspend_ops sa11x0_pm_ops = {
        .enter          = sa11x0_pm_enter,
        .valid          = suspend_valid_only_mem,
 };
index 27cfca5..5bf3f2f 100644 (file)
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
        s3c_pm_check_cleanup();
 }
 
-static struct platform_suspend_ops s3c_pm_ops = {
+static const struct platform_suspend_ops s3c_pm_ops = {
        .enter          = s3c_pm_enter,
        .prepare        = s3c_pm_prepare,
        .finish         = s3c_pm_finish,
index f021edf..32d680e 100644 (file)
@@ -176,7 +176,7 @@ out:
        return 0;
 }
 
-static struct platform_suspend_ops avr32_pm_ops = {
+static const struct platform_suspend_ops avr32_pm_ops = {
        .valid  = avr32_pm_valid_state,
        .enter  = avr32_pm_enter,
 };
index 80884b1..745af2d 100644 (file)
@@ -233,7 +233,7 @@ static int bfin_pm_enter(suspend_state_t state)
        return 0;
 }
 
-struct platform_suspend_ops bfin_pm_ops = {
+static const struct platform_suspend_ops bfin_pm_ops = {
        .enter = bfin_pm_enter,
        .valid  = bfin_pm_valid,
 };
index 4bbd313..acaf91b 100644 (file)
@@ -110,7 +110,7 @@ static void db1x_pm_end(void)
 
 }
 
-static struct platform_suspend_ops db1x_pm_ops = {
+static const struct platform_suspend_ops db1x_pm_ops = {
        .valid          = suspend_valid_only_mem,
        .begin          = db1x_pm_begin,
        .enter          = db1x_pm_enter,
index a999458..902d5b5 100644 (file)
@@ -42,7 +42,7 @@ static int jz4740_pm_enter(suspend_state_t state)
        return 0;
 }
 
-static struct platform_suspend_ops jz4740_pm_ops = {
+static const struct platform_suspend_ops jz4740_pm_ops = {
        .valid          = suspend_valid_only_mem,
        .enter          = jz4740_pm_enter,
 };
index 6c1fd90..f55e07a 100644 (file)
@@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspend_state_t state)
        }
 }
 
-static struct platform_suspend_ops loongson_pm_ops = {
+static const struct platform_suspend_ops loongson_pm_ops = {
        .valid  = loongson_pm_valid_state,
        .enter  = loongson_pm_enter,
 };
index 80234e5..eda0fc2 100644 (file)
@@ -232,7 +232,7 @@ static void lite5200_pm_end(void)
        lite5200_pm_target_state = PM_SUSPEND_ON;
 }
 
-static struct platform_suspend_ops lite5200_pm_ops = {
+static const struct platform_suspend_ops lite5200_pm_ops = {
        .valid          = lite5200_pm_valid,
        .begin          = lite5200_pm_begin,
        .prepare        = lite5200_pm_prepare,
index 568cef6..8310e8b 100644 (file)
@@ -186,7 +186,7 @@ void mpc52xx_pm_finish(void)
        iounmap(mbar);
 }
 
-static struct platform_suspend_ops mpc52xx_pm_ops = {
+static const struct platform_suspend_ops mpc52xx_pm_ops = {
        .valid          = mpc52xx_pm_valid,
        .prepare        = mpc52xx_pm_prepare,
        .enter          = mpc52xx_pm_enter,
index 75ae77f..fd4f2f2 100644 (file)
@@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void)
        return ret;
 }
 
-static struct platform_suspend_ops mpc83xx_suspend_ops = {
+static const struct platform_suspend_ops mpc83xx_suspend_ops = {
        .valid = mpc83xx_suspend_valid,
        .begin = mpc83xx_suspend_begin,
        .enter = mpc83xx_suspend_enter,
index ed72098..a8ca289 100644 (file)
@@ -153,7 +153,7 @@ static struct sysdev_class suspend_sysdev_class = {
        .name = "power",
 };
 
-static struct platform_suspend_ops pseries_suspend_ops = {
+static const struct platform_suspend_ops pseries_suspend_ops = {
        .valid          = suspend_valid_only_mem,
        .begin          = pseries_suspend_begin,
        .prepare_late   = pseries_prepare_late,
index 44de855..e9381bf 100644 (file)
@@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_state_t state)
        return 1;
 }
 
-static struct platform_suspend_ops pmc_suspend_ops = {
+static const struct platform_suspend_ops pmc_suspend_ops = {
        .valid = pmc_suspend_valid,
        .enter = pmc_suspend_enter,
 };
index 4499a37..adc9b4b 100644 (file)
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_t state)
        return 0;
 }
 
-static struct platform_suspend_ops hp6x0_pm_ops = {
+static const struct platform_suspend_ops hp6x0_pm_ops = {
        .enter          = hp6x0_pm_enter,
        .valid          = suspend_valid_only_mem,
 };
index e559687..a6f95ae 100644 (file)
@@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t state)
        return 0;
 }
 
-static struct platform_suspend_ops sh_pm_ops = {
+static const struct platform_suspend_ops sh_pm_ops = {
        .enter          = sh_pm_enter,
        .valid          = suspend_valid_only_mem,
 };
index 5149c9b..ba1caf7 100644 (file)
@@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state)
        }
 }
 
-static struct platform_suspend_ops acpi_suspend_ops = {
+static const struct platform_suspend_ops acpi_suspend_ops = {
        .valid = acpi_suspend_state_valid,
        .begin = acpi_suspend_begin,
        .prepare_late = acpi_pm_prepare,
@@ -347,7 +347,7 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state)
  * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
  * been requested.
  */
-static struct platform_suspend_ops acpi_suspend_ops_old = {
+static const struct platform_suspend_ops acpi_suspend_ops_old = {
        .valid = acpi_suspend_state_valid,
        .begin = acpi_suspend_begin_old,
        .prepare_late = acpi_pm_pre_suspend,
index cd29c82..8b021eb 100644 (file)
@@ -2257,7 +2257,7 @@ static int pmu_sleep_valid(suspend_state_t state)
                && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
 }
 
-static struct platform_suspend_ops pmu_pm_ops = {
+static const struct platform_suspend_ops pmu_pm_ops = {
        .enter = powerbook_sleep,
        .valid = pmu_sleep_valid,
 };
index 40ead94..f45f3cc 100644 (file)
@@ -122,7 +122,7 @@ struct platform_suspend_ops {
  * suspend_set_ops - set platform dependent suspend operations
  * @ops: The new suspend operations to set.
  */
-extern void suspend_set_ops(struct platform_suspend_ops *ops);
+extern void suspend_set_ops(const struct platform_suspend_ops *ops);
 extern int suspend_valid_only_mem(suspend_state_t state);
 
 /**
@@ -147,7 +147,7 @@ extern int pm_suspend(suspend_state_t state);
 #else /* !CONFIG_SUSPEND */
 #define suspend_valid_only_mem NULL
 
-static inline void suspend_set_ops(struct platform_suspend_ops *ops) {}
+static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
 static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
 #endif /* !CONFIG_SUSPEND */
 
index 7335952..80051bd 100644 (file)
@@ -30,13 +30,13 @@ const char *const pm_states[PM_SUSPEND_MAX] = {
        [PM_SUSPEND_MEM]        = "mem",
 };
 
-static struct platform_suspend_ops *suspend_ops;
+static const struct platform_suspend_ops *suspend_ops;
 
 /**
  *     suspend_set_ops - Set the global suspend method table.
  *     @ops:   Pointer to ops structure.
  */
-void suspend_set_ops(struct platform_suspend_ops *ops)
+void suspend_set_ops(const struct platform_suspend_ops *ops)
 {
        mutex_lock(&pm_mutex);
        suspend_ops = ops;