diff options
author | Chris Zankel <chris@zankel.net> | 2012-11-29 01:53:51 +0100 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2012-12-19 06:10:25 +0100 |
commit | c4c4594b005d89b56964071bbbdeb07daac5bc76 (patch) | |
tree | 4c0b50ba3b87a53768bdd7161e90e9874b498127 /arch/xtensa/mm/init.c | |
parent | xtensa: provide endianness macro for sparse (diff) | |
download | linux-c4c4594b005d89b56964071bbbdeb07daac5bc76.tar.xz linux-c4c4594b005d89b56964071bbbdeb07daac5bc76.zip |
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) sysmem.nr_banks++; } sysmem.bank[i].end = start; + + } else if (end < sysmem.bank[i].end) { + sysmem.bank[i].start = end; + } else { - if (end < sysmem.bank[i].end) - sysmem.bank[i].start = end; - else { - /* remove entry */ - sysmem.nr_banks--; - sysmem.bank[i].start = sysmem.bank[sysmem.nr_banks].start; - sysmem.bank[i].end = sysmem.bank[sysmem.nr_banks].end; - } + /* remove entry */ + sysmem.nr_banks--; + sysmem.bank[i].start = sysmem.bank[sysmem.nr_banks].start; + sysmem.bank[i].end = sysmem.bank[sysmem.nr_banks].end; } return -1; } |