From patchwork Tue Dec 20 10:40:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9481407 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4288A600CA for ; Tue, 20 Dec 2016 10:40:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F07B2793A for ; Tue, 20 Dec 2016 10:40:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30F11283A6; Tue, 20 Dec 2016 10:40:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C22E12793A for ; Tue, 20 Dec 2016 10:40:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 247176ED89; Tue, 20 Dec 2016 10:40:23 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wj0-x242.google.com (mail-wj0-x242.google.com [IPv6:2a00:1450:400c:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id B80B46ED80 for ; Tue, 20 Dec 2016 10:40:07 +0000 (UTC) Received: by mail-wj0-x242.google.com with SMTP id he10so27096448wjc.2 for ; Tue, 20 Dec 2016 02:40:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=72CGAmMDi2Mwt8D3WKWO/oHghsWXxlTEo/xJB2f9sZI=; b=cfxJrJHB0tH53eSPqRB3hHK4gB86cUQ1pGpHg+ISbQWJ5eE+PVAKlDEhS9+mqitH1W 5F09a/TEGv0QCZ9oVwXfQyOg4FcwTTFUg5hDMm16F2F5Cx8rP4Ca6r00HRu4aGiEtvS4 S8d486v5yWvBtbGSeAl01Qru7H4hYZi3V486o61zzVLH9j2NtM/bY9c+jAJxL4DWxOzl RzaRb5miRc1CdJ7hKgVI3uQ90thn4Xct4Ayy8BsJ8eiKqmCgelJY/1qjbbeHND+PuySn 6U6af7frNVw1PjDtntW/pcuYc8DmVL1mSykYGks7s+tpt2fXsO1o3sdlN9CTF5rju7S7 1DAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=72CGAmMDi2Mwt8D3WKWO/oHghsWXxlTEo/xJB2f9sZI=; b=T5rY+b18yOD3X5NCboqPQ5xTiBGz08TIjGGKb8eOiaxkMYrNKT4bcrIwZr5jF86/ox Y/pOsRtxuflxxqLrZUC3tafSlIof+KHwmTbUEk/0OTdBxqscxHO472QvHpiPPVdJmi6W H2OqS8+Tr/HuzcMBwEz9x45rbjivh35p20QvP5W9PcCAvy1x/xFMp2n+Nr5QSFhj2yp2 7MADkmV8B6Jep2z3K+qwrFbSePdQQ/Soo0QwDhQLtKIzIw4KYc8U64mPv1xrRc3MtRhk wD55MY9HJ9l/2U5x1WDn2rF4NxV4t7WVw+SqrnIRohpArsI6cqjJBIAsqv/RdKto0oJw Q3LA== X-Gm-Message-State: AKaTC00zKFUBDCNS6iolecTJBvLQdqDBCMbDtJ0POWOoRD/aZKAKcyxi4i647mFmBPgEjg== X-Received: by 10.194.55.104 with SMTP id r8mr17433358wjp.137.1482230405814; Tue, 20 Dec 2016 02:40:05 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id w8sm21359777wmw.4.2016.12.20.02.40.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Dec 2016 02:40:05 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 20 Dec 2016 10:40:03 +0000 Message-Id: <20161220104003.8044-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [PATCH] drm/i915/breadcrumbs: s/container_of/rb_entry/ X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP In keeping with commit f802cf7e0986 ("drm/i915/debugfs: use rb_entry()"), convert the primary user of the rbtrees over to using rb_entry rather than the equivalent container_of. Signed-off-by: Chris Wilson Reviewed-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_breadcrumbs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c index 53ae7884babd..fcfa423d08bd 100644 --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c @@ -154,7 +154,7 @@ static void __intel_breadcrumbs_disable_irq(struct intel_breadcrumbs *b) static inline struct intel_wait *to_wait(struct rb_node *node) { - return container_of(node, struct intel_wait, node); + return rb_entry(node, struct intel_wait, node); } static inline void __intel_breadcrumbs_finish(struct intel_breadcrumbs *b, @@ -427,7 +427,7 @@ static bool signal_complete(struct drm_i915_gem_request *request) static struct drm_i915_gem_request *to_signaler(struct rb_node *rb) { - return container_of(rb, struct drm_i915_gem_request, signaling.node); + return rb_entry(rb, struct drm_i915_gem_request, signaling.node); } static void signaler_set_rtpriority(void)