drm/i915/breadcrumbs: s/container_of/rb_entry/

ickle · ickle · commit d8567862dc04 · 2016-12-20T12:30:25.000Z
In keeping with commit f802cf7 ("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 <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/20161220104003.8044-1-chris@chris-wilson.co.uk Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ static void __intel_breadcrumbs_disable_irq(struct intel_breadcrumbs *b)`
`154`	`154`
`155`	`155`	`static inline struct intel_wait to_wait(struct rb_node node)`
`156`	`156`	`{`
`157`		`- return container_of(node, struct intel_wait, node);`
	`157`	`+ return rb_entry(node, struct intel_wait, node);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`static inline void __intel_breadcrumbs_finish(struct intel_breadcrumbs *b,`
`@@ -427,7 +427,7 @@ static bool signal_complete(struct drm_i915_gem_request *request)`
`427`	`427`
`428`	`428`	`static struct drm_i915_gem_request to_signaler(struct rb_node rb)`
`429`	`429`	`{`
`430`		`- return container_of(rb, struct drm_i915_gem_request, signaling.node);`
	`430`	`+ return rb_entry(rb, struct drm_i915_gem_request, signaling.node);`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`static void signaler_set_rtpriority(void)`