Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750980AbcDQTOs (ORCPT ); Sun, 17 Apr 2016 15:14:48 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:34787 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750746AbcDQTOp (ORCPT ); Sun, 17 Apr 2016 15:14:45 -0400 From: Alexander Kuleshov To: Andrew Morton Cc: Mel Gorman , Pekka Enberg , Tony Luck , Tang Chen , David Gibson , Ard Biesheuvel , linux-mm@kvack.org, linux-kernel@vger.kernel.org, 0xAX Subject: [PATCH] mm/memblock: move memblock_{add,reserve}_region into memblock_{add,reserve} Date: Mon, 18 Apr 2016 01:14:36 +0600 Message-Id: <1460920476-14320-1-git-send-email-kuleshovmail@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.212.g1f992f2.dirty Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2708 Lines: 77 From: 0xAX The memblock_add_region() and memblock_reserve_region do not nothing specific before the call of the memblock_add_range(), only print debug output. We can do the same in the memblock_add() and memblock_reserve() since both memblock_add_region() and memblock_reserve_region are not used by anybody outside of memblock.c and the memblock_{add,reserve}() have the same set of flags and nids. Since the memblock_add_region() and memblock_reserve_region() anyway will be inlined, there will not be functional changes, but will improve code readability a little. Signed-off-by: Alexander Kuleshov --- mm/memblock.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index b570ddd..3b93daa 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -606,22 +606,14 @@ int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size, return memblock_add_range(&memblock.memory, base, size, nid, 0); } -static int __init_memblock memblock_add_region(phys_addr_t base, - phys_addr_t size, - int nid, - unsigned long flags) +int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) { memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n", (unsigned long long)base, (unsigned long long)base + size - 1, - flags, (void *)_RET_IP_); - - return memblock_add_range(&memblock.memory, base, size, nid, flags); -} + 0UL, (void *)_RET_IP_); -int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) -{ - return memblock_add_region(base, size, MAX_NUMNODES, 0); + return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0); } /** @@ -732,22 +724,14 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) return memblock_remove_range(&memblock.reserved, base, size); } -static int __init_memblock memblock_reserve_region(phys_addr_t base, - phys_addr_t size, - int nid, - unsigned long flags) +int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) { memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n", (unsigned long long)base, (unsigned long long)base + size - 1, - flags, (void *)_RET_IP_); - - return memblock_add_range(&memblock.reserved, base, size, nid, flags); -} + 0UL, (void *)_RET_IP_); -int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) -{ - return memblock_reserve_region(base, size, MAX_NUMNODES, 0); + return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0); } /** -- 2.8.0.rc3.212.g1f992f2.dirty