Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 47b90ffe5c10ab9b5cfd14087b28b13109673ee5

Authored by Pavel Machek
Committed by Linus Torvalds
1 parent dc19d507b1
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] swsusp: remove unused variable 

Remove unused variable, and make code less evil that way.  Fix whitespace
around for-loop-like macro.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 1 additions and 8 deletions Side-by-side Diff

kernel/power/swsusp.c
Diff comments   View file @ 47b90ff
... ... @@ -85,18 +85,11 @@
85 85 /* Suspend pagedir is allocated before final copy, therefore it
86 86 must be freed after resume
87 87  
88   - Warning: this is evil. There are actually two pagedirs at time of
89   - resume. One is "pagedir_save", which is empty frame allocated at
90   - time of suspend, that must be freed. Second is "pagedir_nosave",
91   - allocated at time of resume, that travels through memory not to
92   - collide with anything.
93   -
94 88 Warning: this is even more evil than it seems. Pagedirs this file
95 89 talks about are completely different from page directories used by
96 90 MMU hardware.
97 91 */
98 92 suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
99   -suspend_pagedir_t *pagedir_save;
100 93  
101 94 #define SWSUSP_SIG "S1SUSPEND"
102 95  
... ... @@ -385,7 +378,7 @@
385 378 swp_entry_t entry;
386 379 struct pbe *p;
387 380  
388   - for_each_pbe(p, pagedir_nosave) {
  381 + for_each_pbe (p, pagedir_nosave) {
389 382 entry = p->swap_address;
390 383 if (entry.val)
391 384 swap_free(entry);