[PATCH] swsusp: another simplification

From: Pavel Machek <pavel@ucw.cz>

verify is not really descriptive name of function.  Fortunately its insides
are self-documenting which makes it easy to fix.
Signed-off-by: Andrew Morton <akpm@osdl.org>

kernel/power/swsusp.c

@@ -1122,17 +1122,6 @@ static int __init check_sig(void)
 	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.
  *
@@ -1194,13 +1183,14 @@ static int __init read_suspend_image(void)
 {
 	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;
 }