Re: [pm] Some typos

Re: [pm] Some typos

[Pavel Machek]

Hi!

> > > I'll fix my scripts.
> > > Did you apply this and "add initcall" patches?
> > 
> > Yes.
> 
> Though, it produces a warning on compile: 
> 
> kernel/power/swsusp.c:1089: warning: initialization from incompatible pointer type
> 
> ..which is because software_resume() returns void. Could you please fix 
> this? 

Yep. (Cc-ed to list in case I made some stupid mistake). Also added
check: buffer allocation might fail. Please apply,
								Pavel

--- tmp/linux/kernel/power/swsusp.c	2003-10-01 23:24:42.000000000 +0200
+++ linux/kernel/power/swsusp.c	2003-10-01 23:18:27.000000000 +0200
@@ -283,6 +283,9 @@
 	unsigned long address;
 	struct page *page;
 
+	if (!buffer)
+		return -ENOMEM;
+
 	printk( "Writing data to swap (%d pages): ", nr_copy_pages );
 	for (i=0; i<nr_copy_pages; i++) {
 		if (!(i%100))
@@ -1046,23 +1051,23 @@
  *	scheduled program.
  *
  */
-static void __init software_resume(void)
+static int __init software_resume(void)
 {
 	if (num_online_cpus() > 1) {
 		printk(KERN_WARNING "Software Suspend has malfunctioning SMP support. Disabled :(\n");	
-		return;
+		return -EINVAL;
 	}
 	/* We enable the possibility of machine suspend */
 	software_suspend_enabled = 1;
 	if (!resume_status)
-		return;
+		return 0;
 
 	printk( "%s", name_resume );
 	if (resume_status == NORESUME) {
 		if(resume_file[0])
 			read_suspend_image(resume_file, 1);
 		printk( "disabled\n" );
-		return;
+		return 0;
 	}
 	MDELAY(1000);
 
@@ -1071,7 +1076,7 @@
 
 	if (!resume_file[0] && resume_status == RESUME_SPECIFIED) {
 		printk( "suspension device unspecified\n" );
-		return;
+		return -EINVAL;
 	}
 
 	printk( "resuming from %s\n", resume_file);
@@ -1082,7 +1087,7 @@
 
 read_failure:
 	pm_restore_console();
-	return;
+	return 0;
 }
 
 late_initcall(software_resume);

-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]

Re: [pm] Some typos

[Patrick Mochel]

> --- tmp/linux/kernel/power/swsusp.c	2003-10-01 23:24:42.000000000 +0200
> +++ linux/kernel/power/swsusp.c	2003-10-01 23:18:27.000000000 +0200

> -static void __init software_resume(void)
> +static int __init software_resume(void)

This piece failed. It's easy to fix, but please be more careful when 
sending incremental patches.

Thanks,


	Pat

[pm] Some typos

[Pavel Machek]

Hi!

This fixes two small typos in powermanagment, please apply.

							Pavel

--- /usr/src/tmp/linux/kernel/power/disk.c	2003-09-28 22:06:44.000000000 +0200
+++ /usr/src/linux/kernel/power/disk.c	2003-09-28 22:50:47.000000000 +0200
@@ -4,7 +4,7 @@
  * Copyright (c) 2003 Patrick Mochel
  * Copyright (c) 2003 Open Source Development Lab
  *
- * This file is release under the GPLv2
+ * This file is released under the GPLv2.
  *
  */
 
--- /usr/src/tmp/linux/kernel/power/pmdisk.c	2003-09-28 22:06:44.000000000 +0200
+++ /usr/src/linux/kernel/power/pmdisk.c	2003-09-28 22:53:12.000000000 +0200
@@ -448,7 +448,7 @@
 
 
 /**
- *	copy_pages - Atmoically snapshot memory.
+ *	copy_pages - Atomically snapshot memory.
  *
  *	Iterate over all the pages in the system and copy each one 
  *	into its corresponding location in the pagedir.


-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]