diff options
author | Lionel Debroux <lionel_debroux@yahoo.fr> | 2010-11-16 08:14:02 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-11-16 08:14:02 -0500 |
commit | 2f55ac072f5344519348c0c94b3d2f4cca46847b (patch) | |
tree | f3d544ab2812503b12a205b2515111a796638ffb /drivers/acpi/sleep.c | |
parent | acc2472ed33fc5e72482cc3b3b846077d97c2f8b (diff) |
suspend: constify platform_suspend_ops
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>
Diffstat (limited to 'drivers/acpi/sleep.c')
-rw-r--r-- | drivers/acpi/sleep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 5149c9bf7015..ba1caf724a16 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state) | |||
319 | } | 319 | } |
320 | } | 320 | } |
321 | 321 | ||
322 | static struct platform_suspend_ops acpi_suspend_ops = { | 322 | static const struct platform_suspend_ops acpi_suspend_ops = { |
323 | .valid = acpi_suspend_state_valid, | 323 | .valid = acpi_suspend_state_valid, |
324 | .begin = acpi_suspend_begin, | 324 | .begin = acpi_suspend_begin, |
325 | .prepare_late = acpi_pm_prepare, | 325 | .prepare_late = acpi_pm_prepare, |
@@ -347,7 +347,7 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state) | |||
347 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has | 347 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has |
348 | * been requested. | 348 | * been requested. |
349 | */ | 349 | */ |
350 | static struct platform_suspend_ops acpi_suspend_ops_old = { | 350 | static const struct platform_suspend_ops acpi_suspend_ops_old = { |
351 | .valid = acpi_suspend_state_valid, | 351 | .valid = acpi_suspend_state_valid, |
352 | .begin = acpi_suspend_begin_old, | 352 | .begin = acpi_suspend_begin_old, |
353 | .prepare_late = acpi_pm_pre_suspend, | 353 | .prepare_late = acpi_pm_pre_suspend, |