lkml.org 
[lkml]   [2014]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/6] alpha: Remove bracket errors in bootpz.c
Date
This patch removes all errors related to brackets not being placed
correctly in this file as declared when running checkpatch on it.
---
arch/alpha/boot/bootpz.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/arch/alpha/boot/bootpz.c b/arch/alpha/boot/bootpz.c
index 0b5c978..6dd34e4 100644
--- a/arch/alpha/boot/bootpz.c
+++ b/arch/alpha/boot/bootpz.c
@@ -83,11 +83,9 @@ check_range(unsigned long vstart, unsigned long vend,
vstart, vend, kstart, kend);
#endif
/* do some range checking for detecting an overlap... */
- for (vaddr = vstart; vaddr <= vend; vaddr += PAGE_SIZE)
- {
+ for (vaddr = vstart; vaddr <= vend; vaddr += PAGE_SIZE) {
kaddr = (find_pa(vaddr) | PAGE_OFFSET);
- if (kaddr >= kstart && kaddr <= kend)
- {
+ if (kaddr >= kstart && kaddr <= kend) {
#ifdef DEBUG_CHECK_RANGE
srm_printk("OVERLAP: vaddr 0x%lx kaddr 0x%lx"
" [0x%lx:0x%lx]\n",
@@ -310,9 +308,8 @@ start_kernel(void)

/* Get the parameter list from the console environment variable. */
nbytes = callback_getenv(ENV_BOOTED_OSFLAGS, envval, sizeof(envval));
- if (nbytes < 0 || nbytes >= sizeof(envval)) {
+ if (nbytes < 0 || nbytes >= sizeof(envval))
nbytes = 0;
- }
envval[nbytes] = '\0';

#ifdef DEBUG_ADDRESSES
@@ -346,8 +343,7 @@ start_kernel(void)
in conflict.
*/
if (check_range(V_BOOTSTRAPPER_START, V_BOOTSTRAPPER_END,
- K_KERNEL_DATA_START, K_KERNEL_IMAGE_END))
- {
+ K_KERNEL_DATA_START, K_KERNEL_IMAGE_END)) {
srm_printk("FATAL ERROR: overlap of bootstrapper code\n");
__halt();
}
@@ -359,8 +355,7 @@ start_kernel(void)
execution.
*/
if (check_range(V_DATA_START, V_DATA_END,
- K_KERNEL_IMAGE_START, K_COPY_IMAGE_END))
- {
+ K_KERNEL_IMAGE_START, K_COPY_IMAGE_END)) {
#ifdef DEBUG_ADDRESSES
srm_printk("OVERLAP: cannot decompress in place\n");
#endif
@@ -376,8 +371,7 @@ start_kernel(void)
*/
while (check_range(V_DATA_START, V_DATA_END,
uncompressed_image_start,
- uncompressed_image_end))
- {
+ uncompressed_image_end)) {
#if 0
uncompressed_image_start += K_COPY_IMAGE_SIZE;
uncompressed_image_end += K_COPY_IMAGE_SIZE;
--
1.9.1


\
 
 \ /
  Last update: 2014-07-15 22:42    [W:0.075 / U:0.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site