Skip to contentSkip to conversation

swsusp: another simplifycation

PATCH Pavel Machek 1 participant 1 message Sep 10, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi!

verify is not really descriptive name of function. Fortunately its insides are self-documenting which makes it easy to fix. Please apply,

Pavel

kernel/power/swsusp.c +5 -15
@@ -1130,17 +1108,6 @@
 	return error;
 }
 
-
-int __init verify(void)
-{
-	int error;
-
-	if (!(error = check_sig()))
-		error = check_header();
-	return error;
-}
-
-
 /**
  *	swsusp_read_data - Read image pages from swap.
  *
@@ -1202,13 +1171,14 @@
 {
 	int error = 0;
 
-	if ((error = verify()))
+	if ((error = check_sig()))
+		return error;
+	if ((error = check_header()))
 		return error;
 	if ((error = read_pagedir()))
 		return error;
-	if ((error = data_read())) {
-		free_pages((unsigned long)pagedir_nosave,pagedir_order);
-	}
+	if ((error = data_read()))
+		free_pages((unsigned long)pagedir_nosave, pagedir_order);
 	return error;
 }