From patchwork Fri Jan 20 14:36:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 717755 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v4k5j1WwYz9sCg for ; Sat, 21 Jan 2017 01:45:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BeKMXlv5"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752700AbdATOpM (ORCPT ); Fri, 20 Jan 2017 09:45:12 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36823 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752124AbdATOpL (ORCPT ); Fri, 20 Jan 2017 09:45:11 -0500 Received: by mail-pf0-f194.google.com with SMTP id 19so5602574pfo.3; Fri, 20 Jan 2017 06:45:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/Do8xviSUiBmyJitE3roeHelOUIRbY2GEFvhnWMj7Is=; b=BeKMXlv5kKb0TzRCLD9U/lihQt3AFnikW7PS00tz4vfUVRSG5ExY+GGcq2tW4jKlTq LVYkvRQdZADVM/AJs38VxKXrC4QwryjZQ150g9BdOcBibo9UP4r21mpXvs0pfhcOiJho FkrtUuMqOQ82or+KO6ytZnazI73GRgwa2Gv235PS1fHhilbS1wJCOnGmjXXVJNO4MpD5 sSTI3B6XqbqGrdURYNRkCoQXvUPalKOr2oNjIA0FT952eO17c0lAlWw/SYv8uPGLhQKz l+F8oO8XQI1YftyeKEDYzeKo3ch7tbqReaNM+FKuFv024h9u+OhdbxnRVQoeJL/IWKk0 pDNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/Do8xviSUiBmyJitE3roeHelOUIRbY2GEFvhnWMj7Is=; b=L7qOaJ6OqCZJWIe6/48/zCg4uh6UDKsz1tPX8l75dYKFA8G3tH8ex8qj0qrK57QD8B Q/PkCJrUIIV37kMEvL3vd/opXEiBvBvijeWuvGZrD4ijnUEAkj3lGJm9b4fe0W6F1vg/ Mc4ZXUJkoOE2YUcZTb1xuaQyIhiRvPq6e+tYlgLahzMxI64ql+pw9pzulNHirzB/SzpC 4kPmxhSQ0POUuz6xeTNSvf+rl3nyOEWGoD98DCc92amS7d+zdg4TV9fgoOle99K/ndxS GSQ3EICumdfcVKwa3KuuoFlgd7JmQHlsWUrQUTVqnZxBPwtLVJO8xRDIx2rXZr89q+4j YkiQ== X-Gm-Message-State: AIkVDXJvrTIzpLHb/n69HiAn5RUCKmaicAdc7F4oKPpnCC2JJBLZg7c09LiGU0OKQNdu8g== X-Received: by 10.99.147.81 with SMTP id w17mr17277897pgm.111.1484923049137; Fri, 20 Jan 2017 06:37:29 -0800 (PST) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id x2sm17378722pfa.71.2017.01.20.06.37.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Jan 2017 06:37:28 -0800 (PST) From: Geliang Tang To: Yishai Hadas Cc: Geliang Tang , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net/mlx4: use rb_entry() Date: Fri, 20 Jan 2017 22:36:57 +0800 Message-Id: <6c1c772de8f70113580dade04f89a377174d8c88.1484817025.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To make the code clearer, use rb_entry() instead of container_of() to deal with rbtree. Signed-off-by: Geliang Tang Reviewed-by: Leon Romanovsky --- drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index 1822382..6da6e01 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -236,8 +236,8 @@ static void *res_tracker_lookup(struct rb_root *root, u64 res_id) struct rb_node *node = root->rb_node; while (node) { - struct res_common *res = container_of(node, struct res_common, - node); + struct res_common *res = rb_entry(node, struct res_common, + node); if (res_id < res->res_id) node = node->rb_left; @@ -255,8 +255,8 @@ static int res_tracker_insert(struct rb_root *root, struct res_common *res) /* Figure out where to put new node */ while (*new) { - struct res_common *this = container_of(*new, struct res_common, - node); + struct res_common *this = rb_entry(*new, struct res_common, + node); parent = *new; if (res->res_id < this->res_id)