Commit 919606f5 authored by Guenter Roeck's avatar Guenter Roeck Committed by Zhi Wang

drm/i915/gvt: Use list_entry to access list members

Use list_entry() instead of container_of() to access list members.
Also drop unnecessary and misleading NULL checks on the result of
list_entry().
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210523172304.3033229-1-linux@roeck-us.netReviewed-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarZhi Wang <zhi.a.wang@intel.com>
parent 96db1443
...@@ -148,8 +148,7 @@ static void dmabuf_gem_object_free(struct kref *kref) ...@@ -148,8 +148,7 @@ static void dmabuf_gem_object_free(struct kref *kref)
if (vgpu && vgpu->active && !list_empty(&vgpu->dmabuf_obj_list_head)) { if (vgpu && vgpu->active && !list_empty(&vgpu->dmabuf_obj_list_head)) {
list_for_each(pos, &vgpu->dmabuf_obj_list_head) { list_for_each(pos, &vgpu->dmabuf_obj_list_head) {
dmabuf_obj = container_of(pos, dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list);
struct intel_vgpu_dmabuf_obj, list);
if (dmabuf_obj == obj) { if (dmabuf_obj == obj) {
list_del(pos); list_del(pos);
intel_gvt_hypervisor_put_vfio_device(vgpu); intel_gvt_hypervisor_put_vfio_device(vgpu);
...@@ -357,10 +356,8 @@ pick_dmabuf_by_info(struct intel_vgpu *vgpu, ...@@ -357,10 +356,8 @@ pick_dmabuf_by_info(struct intel_vgpu *vgpu,
struct intel_vgpu_dmabuf_obj *ret = NULL; struct intel_vgpu_dmabuf_obj *ret = NULL;
list_for_each(pos, &vgpu->dmabuf_obj_list_head) { list_for_each(pos, &vgpu->dmabuf_obj_list_head) {
dmabuf_obj = container_of(pos, struct intel_vgpu_dmabuf_obj, dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list);
list); if (!dmabuf_obj->info)
if ((dmabuf_obj == NULL) ||
(dmabuf_obj->info == NULL))
continue; continue;
fb_info = (struct intel_vgpu_fb_info *)dmabuf_obj->info; fb_info = (struct intel_vgpu_fb_info *)dmabuf_obj->info;
...@@ -387,11 +384,7 @@ pick_dmabuf_by_num(struct intel_vgpu *vgpu, u32 id) ...@@ -387,11 +384,7 @@ pick_dmabuf_by_num(struct intel_vgpu *vgpu, u32 id)
struct intel_vgpu_dmabuf_obj *ret = NULL; struct intel_vgpu_dmabuf_obj *ret = NULL;
list_for_each(pos, &vgpu->dmabuf_obj_list_head) { list_for_each(pos, &vgpu->dmabuf_obj_list_head) {
dmabuf_obj = container_of(pos, struct intel_vgpu_dmabuf_obj, dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list);
list);
if (!dmabuf_obj)
continue;
if (dmabuf_obj->dmabuf_id == id) { if (dmabuf_obj->dmabuf_id == id) {
ret = dmabuf_obj; ret = dmabuf_obj;
break; break;
...@@ -600,8 +593,7 @@ void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu) ...@@ -600,8 +593,7 @@ void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu)
mutex_lock(&vgpu->dmabuf_lock); mutex_lock(&vgpu->dmabuf_lock);
list_for_each_safe(pos, n, &vgpu->dmabuf_obj_list_head) { list_for_each_safe(pos, n, &vgpu->dmabuf_obj_list_head) {
dmabuf_obj = container_of(pos, struct intel_vgpu_dmabuf_obj, dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list);
list);
dmabuf_obj->vgpu = NULL; dmabuf_obj->vgpu = NULL;
idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id); idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment