From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leon Romanovsky Subject: [PATCH iproute2-next 07/10] rdma: Get rid of dev_map_free call Date: Wed, 27 Dec 2017 09:57:56 +0200 Message-ID: <20171227075759.15289-8-leon@kernel.org> References: <20171227075759.15289-1-leon@kernel.org> Cc: Leon Romanovsky , netdev , Stephen Hemminger To: David Ahern Return-path: Received: from mail.kernel.org ([198.145.29.99]:46642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195AbdL0H6X (ORCPT ); Wed, 27 Dec 2017 02:58:23 -0500 In-Reply-To: <20171227075759.15289-1-leon@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: From: Leon Romanovsky The dev_map_free() is called once only and it is short, so it is better to integrate it into the caller's site. Signed-off-by: Leon Romanovsky --- rdma/utils.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/rdma/utils.c b/rdma/utils.c index 998a178d..c1069967 100644 --- a/rdma/utils.c +++ b/rdma/utils.c @@ -71,15 +71,6 @@ static struct dev_map *dev_map_alloc(const char *dev_name) return dev_map; } -static void dev_map_free(struct dev_map *dev_map) -{ - if (!dev_map) - return; - - free(dev_map->dev_name); - free(dev_map); -} - static void dev_map_cleanup(struct rd *rd) { struct dev_map *dev_map, *tmp; @@ -87,7 +78,8 @@ static void dev_map_cleanup(struct rd *rd) list_for_each_entry_safe(dev_map, tmp, &rd->dev_map_list, list) { list_del(&dev_map->list); - dev_map_free(dev_map); + free(dev_map->dev_name); + free(dev_map); } } -- 2.15.1