diff options
author | Chris Zankel <chris@zankel.net> | 2012-11-28 19:53:51 -0500 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2012-12-19 00:10:25 -0500 |
commit | c4c4594b005d89b56964071bbbdeb07daac5bc76 (patch) | |
tree | 4c0b50ba3b87a53768bdd7161e90e9874b498127 /arch/xtensa/mm/init.c | |
parent | 72100ed7efac290f24bd90a5e7c8bc9f231d167d (diff) |
xtensa: clean up files to make them code-style compliant
Remove heading and trailing spaces, trim trailing lines, and wrap lines
that are longer than 80 characters.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/mm/init.c')
-rw-r--r-- | arch/xtensa/mm/init.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index db955179da2d..7a5156ffebb6 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c | |||
@@ -75,15 +75,15 @@ int __init mem_reserve(unsigned long start, unsigned long end, int must_exist) | |||
75 | sysmem.nr_banks++; | 75 | sysmem.nr_banks++; |
76 | } | 76 | } |
77 | sysmem.bank[i].end = start; | 77 | sysmem.bank[i].end = start; |
78 | |||
79 | } else if (end < sysmem.bank[i].end) { | ||
80 | sysmem.bank[i].start = end; | ||
81 | |||
78 | } else { | 82 | } else { |
79 | if (end < sysmem.bank[i].end) | 83 | /* remove entry */ |
80 | sysmem.bank[i].start = end; | 84 | sysmem.nr_banks--; |
81 | else { | 85 | sysmem.bank[i].start = sysmem.bank[sysmem.nr_banks].start; |
82 | /* remove entry */ | 86 | sysmem.bank[i].end = sysmem.bank[sysmem.nr_banks].end; |
83 | sysmem.nr_banks--; | ||
84 | sysmem.bank[i].start = sysmem.bank[sysmem.nr_banks].start; | ||
85 | sysmem.bank[i].end = sysmem.bank[sysmem.nr_banks].end; | ||
86 | } | ||
87 | } | 87 | } |
88 | return -1; | 88 | return -1; |
89 | } | 89 | } |