From: Nicholas Krause <xerofoify@gmail.com>
To: rth@twiddle.net
Cc: ink@jurassic.park.msu.ru, mattst88@gmail.com,
linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/6] alpha: Remove bracket errors in bootpz.c
Date: Tue, 15 Jul 2014 14:18:22 -0400 [thread overview]
Message-ID: <1405448304-3724-4-git-send-email-xerofoify@gmail.com> (raw)
In-Reply-To: <1405448304-3724-1-git-send-email-xerofoify@gmail.com>
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
next prev parent reply other threads:[~2014-07-15 18:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 18:18 [PATCH 1/6] alpha: Remove whiterrors related to uneeded characters and lines Nicholas Krause
2014-07-15 18:18 ` [PATCH 2/6] alpha: Fix spaces to tabs Nicholas Krause
2014-07-15 18:18 ` [PATCH 3/6] alpha: Remove all errors for checkpatch foo* bar Nicholas Krause
2014-07-15 18:18 ` Nicholas Krause [this message]
2014-07-15 18:18 ` [PATCH 5/6] alpha: Add line below declartion on line 287 Nicholas Krause
2014-07-15 18:18 ` [PATCH 6/6] alpha: Join lines 90 and 91 Nicholas Krause
2014-07-15 18:54 ` Måns Rullgård
2014-07-15 19:19 ` Nick Krause
2014-07-15 19:20 ` Nick Krause
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405448304-3724-4-git-send-email-xerofoify@gmail.com \
--to=xerofoify@gmail.com \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mattst88@gmail.com \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome