swsusp: Small cleanups

From: Pavel Machek
Date: Sat Dec 25 2004 - 12:42:50 EST


Hi!

This adds statics at few places and fixes stale references to
pmdisk. Please apply,
Pavel

Signed-off-by: Pavel Machek <pavel@xxxxxxx>

--- clean-cvs/kernel/power/swsusp.c 2004-12-14 20:43:42.000000000 +0100
+++ linux-cvs/kernel/power/swsusp.c 2004-12-14 20:48:31.000000000 +0100
@@ -104,14 +102,14 @@

#define SWSUSP_SIG "S1SUSPEND"

-struct swsusp_header {
+static struct swsusp_header {
char reserved[PAGE_SIZE - 20 - sizeof(swp_entry_t)];
swp_entry_t swsusp_info;
char orig_sig[10];
char sig[10];
} __attribute__((packed, aligned(PAGE_SIZE))) swsusp_header;

-struct swsusp_info swsusp_info;
+static struct swsusp_info swsusp_info;

/*
* XXX: We try to keep some more pages free so that I/O operations succeed
@@ -174,7 +172,7 @@
resume_device == MKDEV(imajor(inode), iminor(inode));
}

-int swsusp_swap_check(void) /* This is called before saving image */
+static int swsusp_swap_check(void) /* This is called before saving image */
{
int i, len;

@@ -1216,7 +1189,7 @@
}

/**
- * pmdisk_read - Read saved image from swap.
+ * swsusp_read - Read saved image from swap.
*/

int __init swsusp_read(void)
@@ -1240,6 +1213,6 @@
if (!error)
pr_debug("Reading resume file was successful\n");
else
- pr_debug("pmdisk: Error %d resuming\n", error);
+ pr_debug("swsusp: Error %d resuming\n", error);
return error;
}

--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/