Skip to content

Commit b364f3c

Browse files
Uwe Kleine-KönigAndi Shyti
authored andcommitted
drm/i915: Simplify expression &to_i915(dev)->drm
to_i915 is defined as container_of(dev, struct drm_i915_private, drm); So for a struct drm_device *dev, to_i915(dev)->drm is just dev. Simplify accordingly. Signed-off-by: Uwe Kleine-König <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent e91a777 commit b364f3c

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

drivers/gpu/drm/i915/display/intel_display_debugfs.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -819,8 +819,7 @@ static ssize_t i915_displayport_test_active_write(struct file *file,
819819
if (IS_ERR(input_buffer))
820820
return PTR_ERR(input_buffer);
821821

822-
drm_dbg(&to_i915(dev)->drm,
823-
"Copied %d bytes from user\n", (unsigned int)len);
822+
drm_dbg(dev, "Copied %d bytes from user\n", (unsigned int)len);
824823

825824
drm_connector_list_iter_begin(dev, &conn_iter);
826825
drm_for_each_connector_iter(connector, &conn_iter) {
@@ -839,8 +838,7 @@ static ssize_t i915_displayport_test_active_write(struct file *file,
839838
status = kstrtoint(input_buffer, 10, &val);
840839
if (status < 0)
841840
break;
842-
drm_dbg(&to_i915(dev)->drm,
843-
"Got %d for test active\n", val);
841+
drm_dbg(dev, "Got %d for test active\n", val);
844842
/* To prevent erroneous activation of the compliance
845843
* testing code, only accept an actual value of 1 here
846844
*/

drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
818818
if (obj->bit_17 == NULL) {
819819
obj->bit_17 = bitmap_zalloc(page_count, GFP_KERNEL);
820820
if (obj->bit_17 == NULL) {
821-
drm_err(&to_i915(obj->base.dev)->drm,
821+
drm_err(obj->base.dev,
822822
"Failed to allocate memory for bit 17 record\n");
823823
return;
824824
}

drivers/gpu/drm/i915/i915_vma.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ static void vma_print_allocator(struct i915_vma *vma, const char *reason)
7474
char buf[512];
7575

7676
if (!vma->node.stack) {
77-
drm_dbg(&to_i915(vma->obj->base.dev)->drm,
77+
drm_dbg(vma->obj->base.dev,
7878
"vma.node [%08llx + %08llx] %s: unknown owner\n",
7979
vma->node.start, vma->node.size, reason);
8080
return;
8181
}
8282

8383
stack_depot_snprint(vma->node.stack, buf, sizeof(buf), 0);
84-
drm_dbg(&to_i915(vma->obj->base.dev)->drm,
84+
drm_dbg(vma->obj->base.dev,
8585
"vma.node [%08llx + %08llx] %s: inserted at %s\n",
8686
vma->node.start, vma->node.size, reason, buf);
8787
}
@@ -805,7 +805,7 @@ i915_vma_insert(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,
805805
* attempt to find space.
806806
*/
807807
if (size > end - 2 * guard) {
808-
drm_dbg(&to_i915(vma->obj->base.dev)->drm,
808+
drm_dbg(vma->obj->base.dev,
809809
"Attempting to bind an object larger than the aperture: request=%llu > %s aperture=%llu\n",
810810
size, flags & PIN_MAPPABLE ? "mappable" : "total", end);
811811
return -ENOSPC;

0 commit comments

Comments
 (0)