include/linux/memblock.h: Clean up code for several trivial details
authorChen Gang <chengang@emindsoft.com.cn>
Tue, 26 Jul 2016 22:24:47 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2016 23:19:19 +0000 (16:19 -0700)
Correct the function parameters alignment, since original code already
use both tabs and white spaces together for the incorrect parameters
alignment functions.

If one line can hold one statement within 80 columns, let it in one line
(original code did not consider about the tabs/spaces for 2nd line when
a statement is separated into 2 lines).

Try to let '' aligned within one macro, since all related lines are
short enough.

Remove useless statement "idx = 0;", and always assign rgn within the
'for' statement.

Link: http://lkml.kernel.org/r/1464904899-1714-1-git-send-email-chengang@emindsoft.com.cn
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/memblock.h

index 3106ac1c895e0853c3be61b4edee37160f25ca03..6c14b6179727010f15c8ea3fcab036a32bfc84ad 100644 (file)
@@ -73,8 +73,8 @@ extern bool movable_node_enabled;
        if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
 
 phys_addr_t memblock_find_in_range_node(phys_addr_t size, phys_addr_t align,
-                                           phys_addr_t start, phys_addr_t end,
-                                           int nid, ulong flags);
+                                       phys_addr_t start, phys_addr_t end,
+                                       int nid, ulong flags);
 phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end,
                                   phys_addr_t size, phys_addr_t align);
 phys_addr_t get_allocated_memblock_reserved_regions_info(phys_addr_t *addr);
@@ -110,7 +110,7 @@ void __next_mem_range_rev(u64 *idx, int nid, ulong flags,
                          phys_addr_t *out_end, int *out_nid);
 
 void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start,
-                              phys_addr_t *out_end);
+                               phys_addr_t *out_end);
 
 /**
  * for_each_mem_range - iterate through memblock areas from type_a and not
@@ -148,7 +148,7 @@ void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start,
                               p_start, p_end, p_nid)                   \
        for (i = (u64)ULLONG_MAX,                                       \
                     __next_mem_range_rev(&i, nid, flags, type_a, type_b,\
-                                        p_start, p_end, p_nid);        \
+                                         p_start, p_end, p_nid);       \
             i != (u64)ULLONG_MAX;                                      \
             __next_mem_range_rev(&i, nid, flags, type_a, type_b,       \
                                  p_start, p_end, p_nid))
@@ -163,8 +163,7 @@ void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start,
  * is initialized.
  */
 #define for_each_reserved_mem_region(i, p_start, p_end)                        \
-       for (i = 0UL,                                                   \
-            __next_reserved_mem_region(&i, p_start, p_end);            \
+       for (i = 0UL, __next_reserved_mem_region(&i, p_start, p_end);   \
             i != (u64)ULLONG_MAX;                                      \
             __next_reserved_mem_region(&i, p_start, p_end))
 
@@ -403,15 +402,14 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
 }
 
 #define for_each_memblock(memblock_type, region)                                       \
-       for (region = memblock.memblock_type.regions;                           \
+       for (region = memblock.memblock_type.regions;                                   \
             region < (memblock.memblock_type.regions + memblock.memblock_type.cnt);    \
             region++)
 
 #define for_each_memblock_type(memblock_type, rgn)                     \
-       idx = 0;                                                        \
-       rgn = &memblock_type->regions[idx];                             \
-       for (idx = 0; idx < memblock_type->cnt;                         \
-            idx++,rgn = &memblock_type->regions[idx])
+       for (idx = 0, rgn = &memblock_type->regions[0];                 \
+            idx < memblock_type->cnt;                                  \
+            idx++, rgn = &memblock_type->regions[idx])
 
 #ifdef CONFIG_MEMTEST
 extern void early_memtest(phys_addr_t start, phys_addr_t end);