Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b364b8d authored by Andreas Mohr's avatar Andreas Mohr Committed by Linus Torvalds
Browse files

[PATCH] constify parts of kernel/power/ 



Signed-off-by: default avatarAndreas Mohr <andi@lisas.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 43b0bc00

kernel/power/disk.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int software_resume(void) 
late_initcall(software_resume);





static char * pm_disk_modes[] = {

static const char * const pm_disk_modes[] = {

	[PM_DISK_FIRMWARE]	= "firmware",

	[PM_DISK_PLATFORM]	= "platform",

	[PM_DISK_SHUTDOWN]	= "shutdown",

kernel/power/main.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void suspend_finish(suspend_state_t state) 






static char *pm_states[PM_SUSPEND_MAX] = {

static const char * const pm_states[PM_SUSPEND_MAX] = {

	[PM_SUSPEND_STANDBY]	= "standby",

	[PM_SUSPEND_MEM]	= "mem",

#ifdef CONFIG_SOFTWARE_SUSPEND
@@ -262,7 +262,7 @@ static ssize_t state_show(struct subsystem * subsys, char * buf) 
static ssize_t state_store(struct subsystem * subsys, const char * buf, size_t n)

{

	suspend_state_t state = PM_SUSPEND_STANDBY;

	char ** s;

	const char * const *s;

	char *p;

	int error;

	int len;