common: Remove duplicate newlines
Drop all duplicate newlines. No functional change.
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
diff --git a/common/bootstage.c b/common/bootstage.c
index fb6befc..df83eb6 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -3,7 +3,6 @@
* Copyright (c) 2011, Google Inc. All rights reserved.
*/
-
/*
* This module records the progress of boot and arbitrary commands, and
* permits accurate timestamping of each.
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 96a9820..a6a8edc 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -732,7 +732,6 @@
return EXIT_SUCCESS;
}
-
/* built-in 'pwd' handler */
static int builtin_pwd(struct child_prog *dummy)
{
@@ -784,7 +783,6 @@
return EXIT_SUCCESS;
}
-
/* Built-in 'shift' handler */
static int builtin_shift(struct child_prog *child)
{
@@ -1732,7 +1730,6 @@
pseudo_exec(child);
}
-
/* put our child in the process group whose leader is the
first process in this pipe */
if (pi->pgrp < 0) {
@@ -3409,7 +3406,6 @@
last_return_code=EXIT_SUCCESS;
-
if (argv[0] && argv[0][0] == '-') {
debug_printf("\nsourcing /etc/profile\n");
if ((input = fopen("/etc/profile", "r")) != NULL) {
diff --git a/common/cli_hush_upstream.c b/common/cli_hush_upstream.c
index ca40bbb..7874b39 100644
--- a/common/cli_hush_upstream.c
+++ b/common/cli_hush_upstream.c
@@ -392,7 +392,6 @@
#define BASH_TEST2 (ENABLE_HUSH_BASH_COMPAT && ENABLE_HUSH_TEST)
#define BASH_READ_D ENABLE_HUSH_BASH_COMPAT
-
/* Build knobs */
#define LEAK_HUNTING 0
#define BUILD_AS_NOMMU 0
@@ -413,7 +412,6 @@
*/
#define ENABLE_HUSH_DOLLAR_OPS 1
-
#if BUILD_AS_NOMMU
# undef BB_MMU
# undef USE_FOR_NOMMU
@@ -519,7 +517,6 @@
} nommu_save_t;
#endif
-
enum {
RES_NONE = 0,
#if ENABLE_HUSH_IF
@@ -829,7 +826,6 @@
};
#endif
-
/* set -/+o OPT support. (TODO: make it optional)
* bash supports the following opts:
* allexport off
@@ -1118,7 +1114,6 @@
} while (0)
#endif /* !__U_BOOT__ */
-
#ifndef __U_BOOT__
/* Function prototypes for builtins */
static int builtin_cd(char **argv) FAST_FUNC;
@@ -1416,7 +1411,6 @@
# define debug_print_strings(prefix, vv) ((void)0)
#endif
-
/* Leak hunting. Use hush_leaktool.sh for post-processing.
*/
#if LEAK_HUNTING
@@ -1449,7 +1443,6 @@
# define free(p) xxfree(p)
#endif
-
/* Syntax and runtime errors. They always abort scripts.
* In interactive use they usually discard unparsed and/or unexecuted commands
* and return to the prompt.
@@ -1689,7 +1682,6 @@
return newfd;
}
-
/* Manipulating HFILEs */
static HFILE *hfopen(const char *name)
{
@@ -1882,7 +1874,6 @@
}
#endif /* !__U_BOOT__ */
-
#ifndef __U_BOOT__
/* Basic theory of signal handling in shell
* ========================================
@@ -2331,7 +2322,6 @@
return last_sig;
}
-
static const char *get_cwd(int force)
{
if (force || G.cwd == NULL) {
@@ -2653,7 +2643,6 @@
}
#endif
-
#ifndef __U_BOOT__
/*
* Helpers for "var1=val1 var2=val2 cmd" feature
@@ -2728,7 +2717,6 @@
free(strings);
}
-
/*
* Unicode helper
*/
@@ -3236,7 +3224,6 @@
i->p = s;
}
-
/*
* o_string support
*/
@@ -3997,7 +3984,6 @@
}
}
-
/*** Parsing routines ***/
#ifndef debug_print_tree
@@ -4648,7 +4634,6 @@
return 0;
}
-
#ifndef __U_BOOT__
/* Peek ahead in the input to find out if we have a "&n" construct,
* as in "2>&1", that represents duplicating a file descriptor.
@@ -4958,7 +4943,6 @@
return heredoc_cnt;
}
-
static int run_list(struct pipe *pi);
#if BB_MMU
#define parse_stream(pstring, heredoc_cnt_ptr, input, end_trigger) \
@@ -5175,7 +5159,6 @@
}
}
-
/* Process `cmd` - copy contents until "`" is seen. Complicated by
* \` quoting.
* "Within the backquoted style of command substitution, backslash
@@ -6477,7 +6460,6 @@
}
}
-
/*** Execution routines ***/
/* Expansion can recurse, need forward decls: */
@@ -7778,7 +7760,6 @@
return p;
}
-
static void switch_off_special_sigs(unsigned mask)
{
unsigned sig = 0;
@@ -8297,7 +8278,6 @@
}
#endif /* ENABLE_HUSH_TICK */
-
static void setup_heredoc(struct redir_struct *redir)
{
struct fd_pair pair;
@@ -9006,7 +8986,6 @@
}
#endif /* ENABLE_HUSH_FUNCTIONS */
-
#ifndef __U_BOOT__
#if BB_MMU
#define exec_builtin(to_free, x, argv) \
@@ -9042,7 +9021,6 @@
}
#endif /* !__U_BOOT__ */
-
#ifndef __U_BOOT__
static void execvp_or_die(char **argv) NORETURN;
static void execvp_or_die(char **argv)
@@ -10839,7 +10817,6 @@
return rcode;
}
-
#ifndef __U_BOOT__
static void install_sighandlers(unsigned mask)
{
@@ -11524,8 +11501,6 @@
hush_exit(G.last_exitcode);
}
-
-
/*
* Built-ins
*/
@@ -13004,7 +12979,6 @@
if (l < (unsigned long)p) l = (unsigned long)p;
free(p);
-
# if 0 /* debug */
{
struct mallinfo mi = mallinfo();
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 9549c59..62e8557 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -53,7 +53,6 @@
Thanks to Martin Fong and others for supplying this.
*/
-
#ifdef WIN32
#define AlignPage(add) (((add) + (malloc_getpagesize-1)) & \
@@ -155,7 +154,6 @@
}
-
void* wsbrk (long size)
{
void* tmp;
@@ -236,13 +234,10 @@
#endif
-
-
/*
Type declarations
*/
-
struct malloc_chunk
{
INTERNAL_SIZE_T prev_size; /* Size of previous chunk (if free). */
@@ -270,7 +265,6 @@
An allocated chunk looks like this:
-
chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| Size of previous chunk, if allocated | |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -284,7 +278,6 @@
| Size of chunk |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
Where "chunk" is the front of the chunk for the purpose of most of
the malloc code, but "mem" is the pointer that is returned to the
user. "Nextchunk" is the beginning of the next contiguous chunk.
@@ -401,14 +394,10 @@
#define aligned_OK(m) (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0)
-
-
-
/*
Physical chunk operations
*/
-
/* size field is or'ed with PREV_INUSE when previous adjacent chunk in use */
#define PREV_INUSE 0x1
@@ -421,7 +410,6 @@
#define SIZE_BITS (PREV_INUSE|IS_MMAPPED)
-
/* Ptr to next physical malloc_chunk. */
#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->size & ~PREV_INUSE) ))
@@ -431,14 +419,10 @@
#define prev_chunk(p)\
((mchunkptr)( ((char*)(p)) - ((p)->prev_size) ))
-
/* Treat space at ptr + offset as a chunk */
#define chunk_at_offset(p, s) ((mchunkptr)(((char*)(p)) + (s)))
-
-
-
/*
Dealing with use bits
*/
@@ -475,9 +459,6 @@
#define clear_inuse_bit_at_offset(p, s)\
(((mchunkptr)(((char*)(p)) + (s)))->size &= ~(PREV_INUSE))
-
-
-
/*
Dealing with size fields
*/
@@ -498,10 +479,6 @@
#define set_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_size = (s))
-
-
-
-
/*
Bins
@@ -555,7 +532,6 @@
#define top (av_[2]) /* The topmost chunk */
#define last_remainder (bin_at(1)) /* remainder from last split */
-
/*
Because top initially points to its own bin with initial
zero size, thus forcing extension on the first malloc request,
@@ -671,8 +647,6 @@
#define is_small_request(nb) (nb < MAX_SMALLBIN_SIZE - SMALLBIN_WIDTH)
-
-
/*
To help compensate for the large number of bins, a one-level index
structure is used for bin-by-bin searching. `binblocks' is a
@@ -694,10 +668,6 @@
#define mark_binblock(ii) (binblocks_w = (mbinptr)(binblocks_r | idx2binblock(ii)))
#define clear_binblock(ii) (binblocks_w = (mbinptr)(binblocks_r & ~(idx2binblock(ii))))
-
-
-
-
/* Other static bookkeeping data */
/* variables holding tunable values */
@@ -770,7 +740,6 @@
#ifdef DEBUG
-
/*
These routines make a number of assertions about the states
of data structures that should be true at all times. If any
@@ -799,7 +768,6 @@
}
-
#if __STD_C
static void do_check_free_chunk(mchunkptr p)
#else
@@ -885,13 +853,11 @@
/* ... and alignment */
assert(aligned_OK(chunk2mem(p)));
-
/* ... and was allocated at front of an available chunk */
assert(prev_inuse(p));
}
-
#define check_free_chunk(P) do_check_free_chunk(P)
#define check_inuse_chunk(P) do_check_inuse_chunk(P)
#define check_chunk(P) do_check_chunk(P)
@@ -903,13 +869,10 @@
#define check_malloced_chunk(P,N)
#endif
-
-
/*
Macro-based internal utilities
*/
-
/*
Linking chunks in bin lists.
Call these only with variables, not arbitrary expressions, as arguments.
@@ -920,7 +883,6 @@
putting it ahead of others of same size.
*/
-
#define frontlink(P, S, IDX, BK, FD) \
{ \
if (S < MAX_SMALLBIN_SIZE) \
@@ -950,7 +912,6 @@
} \
}
-
/* take a chunk off a list */
#define unlink(P, BK, FD) \
@@ -974,10 +935,6 @@
#define clear_last_remainder \
(last_remainder->fd = last_remainder->bk = last_remainder)
-
-
-
-
/* Routines dealing with mmap(). */
#if HAVE_MMAP
@@ -1219,12 +1176,8 @@
assert(((unsigned long)((char*)top + top_size) & (pagesz - 1)) == 0);
}
-
-
-
/* Main public routines */
-
/*
Malloc Algorthim:
@@ -1275,7 +1228,6 @@
contiguous memory. Thus, it should be safe to intersperse
mallocs with other sbrk calls.
-
All allocations are made from the the `lowest' part of any found
chunk. (The implementation invariant is that prev_inuse is
always true of any allocated chunk; i.e., that each allocated
@@ -1514,7 +1466,6 @@
}
}
-
/* Try to use top chunk */
/* Require that there be a remainder, ensuring top always exists */
@@ -1545,9 +1496,6 @@
}
-
-
-
/*
free() algorithm :
@@ -1569,7 +1517,6 @@
*/
-
STATIC_IF_MCHECK
#if __STD_C
void fREe_impl(Void_t* mem)
@@ -1665,17 +1612,12 @@
unlink(next, bck, fwd);
}
-
set_head(p, sz | PREV_INUSE);
set_foot(p, sz);
if (!islr)
frontlink(p, sz, idx, bck, fwd);
}
-
-
-
-
/*
Realloc algorithm:
@@ -1708,10 +1650,8 @@
and allowing it would also allow too many other incorrect
usages of realloc to be sensible.
-
*/
-
STATIC_IF_MCHECK
#if __STD_C
Void_t* rEALLOc_impl(Void_t* oldmem, size_t bytes)
@@ -1762,7 +1702,6 @@
newp = oldp = mem2chunk(oldmem);
newsize = oldsize = chunksize(oldp);
-
nb = request2size(bytes);
#if HAVE_MMAP
@@ -1910,7 +1849,6 @@
VALGRIND_MAKE_MEM_DEFINED(oldmem, bytes);
}
-
split: /* split off extra room in old or expanded chunk */
if (newsize - nb >= MINSIZE) /* split off remainder */
@@ -1934,9 +1872,6 @@
return chunk2mem(newp);
}
-
-
-
/*
memalign algorithm:
@@ -1955,7 +1890,6 @@
*/
-
STATIC_IF_MCHECK
#if __STD_C
Void_t* mEMALIGn_impl(size_t alignment, size_t bytes)
@@ -2104,9 +2038,6 @@
}
-
-
-
/*
valloc just invokes memalign with alignment argument equal
to the page size of the system (or as near to this as can
@@ -2127,7 +2058,6 @@
that will accommodate request
*/
-
#if __STD_C
Void_t* pvALLOc(size_t bytes)
#else
@@ -2156,7 +2086,6 @@
INTERNAL_SIZE_T sz = n * elem_size;
-
/* check if expand_top called, in which case don't need to clear */
#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT)
#if MORECORE_CLEARS
@@ -2182,7 +2111,6 @@
/* Two optional cases in which clearing not necessary */
-
#if HAVE_MMAP
if (chunk_is_mmapped(p)) return mem;
#endif
@@ -2223,7 +2151,6 @@
}
#endif
-
#ifdef MCHECK_HEAP_PROTECTION
#include "mcheck_core.inc.h"
#if !__STD_C
@@ -2308,7 +2235,6 @@
// mcheck API }
#endif
-
/*
Malloc_trim gives memory back to the system (via negative
@@ -2388,8 +2314,6 @@
}
}
-
-
/*
malloc_usable_size:
@@ -2423,9 +2347,6 @@
}
}
-
-
-
/* Utility to update current_mallinfo for malloc_stats and mallinfo() */
#ifdef DEBUG
@@ -2468,8 +2389,6 @@
}
#endif /* DEBUG */
-
-
/*
malloc_stats:
@@ -2514,9 +2433,6 @@
}
#endif /* DEBUG */
-
-
-
/*
mallopt:
diff --git a/common/edid.c b/common/edid.c
index 865ba9d..48a7376 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -268,7 +268,6 @@
panel_bits_per_colourp, NULL, NULL);
}
-
/**
* Snip the tailing whitespace/return of a string.
*
diff --git a/common/kallsyms.c b/common/kallsyms.c
index 49b3897..9159441 100644
--- a/common/kallsyms.c
+++ b/common/kallsyms.c
@@ -5,7 +5,6 @@
* Licensed under the GPL-2 or later.
*/
-
/* We need the weak marking as this symbol is provided specially */
extern const char system_map[] __attribute__((weak));
diff --git a/common/kgdb.c b/common/kgdb.c
index 01a09f1..ed2798b 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -446,7 +446,6 @@
}
break;
-
case 'k': /* kill the program, actually return to monitor */
kd.extype = KGDBEXIT_KILL;
*regs = entry_regs;
diff --git a/common/menu.c b/common/menu.c
index e484249..8cc9bf0 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -398,7 +398,6 @@
} else
m->title = NULL;
-
INIT_LIST_HEAD(&m->items);
return m;
diff --git a/common/update.c b/common/update.c
index eb0b60a..6801b49 100644
--- a/common/update.c
+++ b/common/update.c
@@ -254,7 +254,6 @@
else
addr = CONFIG_UPDATE_LOAD_ADDR;
-
if (update_load(filename, CONFIG_UPDATE_TFTP_MSEC_MAX,
CONFIG_UPDATE_TFTP_CNT_MAX, addr)) {
printf("Can't load update file, aborting auto-update\n");
diff --git a/common/usb.c b/common/usb.c
index f5b21c8..7a84352 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -190,7 +190,6 @@
}
#endif /* !CONFIG_IS_ENABLED(DM_USB) */
-
/*-------------------------------------------------------------------
* Message wrappers.
*
@@ -293,7 +292,6 @@
return -EIO;
}
-
/*-------------------------------------------------------------------
* Max Packet stuff
*/
@@ -559,7 +557,6 @@
return 0;
}
-
/**********************************************************************
* get_descriptor type
*/
@@ -768,7 +765,6 @@
return result;
}
-
static void usb_try_string_workarounds(unsigned char *buf, int *length)
{
int newlength, oldlength = *length;
@@ -783,7 +779,6 @@
}
}
-
static int usb_string_sub(struct usb_device *dev, unsigned int langid,
unsigned int index, unsigned char *buf)
{
@@ -818,7 +813,6 @@
return rc;
}
-
/********************************************************************
* usb_string:
* Get string index and translate it to ascii.
@@ -874,7 +868,6 @@
return err;
}
-
/********************************************************************
* USB device handling:
* the USB device are static allocated [USB_MAX_DEVICE].
@@ -1388,5 +1381,4 @@
}
#endif
-
/* EOF */
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 807f490..6a4bcec 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -162,7 +162,6 @@
return ret;
}
-
static void usb_hub_power_on(struct usb_hub_device *hub)
{
int i;
diff --git a/common/usb_storage.c b/common/usb_storage.c
index a79ed2e..ac331f1 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -31,7 +31,6 @@
* only been tested with USB memory sticks.
*/
-
#include <blk.h>
#include <bootdev.h>
#include <command.h>
@@ -352,7 +351,6 @@
return 0;
}
-
#ifdef DEBUG
static void usb_show_srb(struct scsi_cmd *pccb)
@@ -664,7 +662,6 @@
return result;
}
-
static int usb_stor_CBI_get_status(struct scsi_cmd *srb, struct us_data *us)
{
int timeout;
@@ -1116,7 +1113,6 @@
return ss->transport(srb, ss);
}
-
#ifdef CONFIG_USB_BIN_FIXUP
/*
* Some USB storage devices queried for SCSI identification data respond with
diff --git a/common/xyzModem.c b/common/xyzModem.c
index 9feb240..09f74a1 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -62,7 +62,6 @@
#define xyzModem_MAX_RETRIES_WITH_CRC 10
#define xyzModem_CAN_COUNT 3 /* Wait for 3 CAN before quitting */
-
typedef int cyg_int32;
static int
CYGACC_COMM_IF_GETC_TIMEOUT (char chan, char *c)
@@ -177,7 +176,6 @@
return true;
}
-
#if defined(DEBUG) && !CONFIG_IS_ENABLED(USE_TINY_PRINTF)
/*
* Note: this debug setup works by storing the strings in a fixed buffer