Эх сурвалжийг харах

drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit.

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Jakob Bornecrantz 15 жил өмнө
parent
commit
bbfad33663

+ 2 - 4
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

@@ -50,8 +50,6 @@ struct vmw_legacy_display_unit {
 	struct vmw_display_unit base;
 	struct vmw_display_unit base;
 
 
 	struct list_head active;
 	struct list_head active;
-
-	unsigned unit;
 };
 };
 
 
 static void vmw_ldu_destroy(struct vmw_legacy_display_unit *ldu)
 static void vmw_ldu_destroy(struct vmw_legacy_display_unit *ldu)
@@ -204,7 +202,7 @@ static int vmw_ldu_add_active(struct vmw_private *vmw_priv,
 
 
 	at = &ld->active;
 	at = &ld->active;
 	list_for_each_entry(entry, &ld->active, active) {
 	list_for_each_entry(entry, &ld->active, active) {
-		if (entry->unit > ldu->unit)
+		if (entry->base.unit > ldu->base.unit)
 			break;
 			break;
 
 
 		at = &entry->active;
 		at = &entry->active;
@@ -491,7 +489,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
 	if (!ldu)
 	if (!ldu)
 		return -ENOMEM;
 		return -ENOMEM;
 
 
-	ldu->unit = unit;
+	ldu->base.unit = unit;
 	crtc = &ldu->base.crtc;
 	crtc = &ldu->base.crtc;
 	encoder = &ldu->base.encoder;
 	encoder = &ldu->base.encoder;
 	connector = &ldu->base.connector;
 	connector = &ldu->base.connector;