From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat, 28 Sep 2013 14:08:24 +0000 (+0100)
Subject: gallium/targets/xorg: drop set but unused variable entity
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9e6e6382f8c38b47691495e5a710935115b6702;p=mesa.git

gallium/targets/xorg: drop set but unused variable entity

The function xf86GetEntityInfo() retrieves the entity rather than
doing any changes. Remove this no-op code.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
---

diff --git a/src/gallium/targets/r600/xorg/xorg.c b/src/gallium/targets/r600/xorg/xorg.c
index 83610fd3fd2..b0b0ef0a2ef 100644
--- a/src/gallium/targets/r600/xorg/xorg.c
+++ b/src/gallium/targets/r600/xorg/xorg.c
@@ -129,7 +129,6 @@ r600_xorg_pci_probe(DriverPtr driver,
 	  int entity_num, struct pci_device *device, intptr_t match_data)
 {
     ScrnInfoPtr scrn = NULL;
-    EntityInfoPtr entity;
 
     scrn = xf86ConfigPciEntity(scrn, 0, entity_num, r600_xorg_pci_devices,
 			       NULL, NULL, NULL, NULL, NULL);
@@ -139,8 +138,6 @@ r600_xorg_pci_probe(DriverPtr driver,
 	scrn->name = "R600G";
 	scrn->Probe = NULL;
 
-	entity = xf86GetEntityInfo(entity_num);
-
 	/* Use all the functions from the xorg tracker */
 	xorg_tracker_set_functions(scrn);
     }
diff --git a/src/gallium/targets/radeonsi/xorg/xorg.c b/src/gallium/targets/radeonsi/xorg/xorg.c
index cce79263953..7858f03ef16 100644
--- a/src/gallium/targets/radeonsi/xorg/xorg.c
+++ b/src/gallium/targets/radeonsi/xorg/xorg.c
@@ -129,7 +129,6 @@ radeonsi_xorg_pci_probe(DriverPtr driver,
 	  int entity_num, struct pci_device *device, intptr_t match_data)
 {
     ScrnInfoPtr scrn = NULL;
-    EntityInfoPtr entity;
 
     scrn = xf86ConfigPciEntity(scrn, 0, entity_num, radeonsi_xorg_pci_devices,
 			       NULL, NULL, NULL, NULL, NULL);
@@ -139,8 +138,6 @@ radeonsi_xorg_pci_probe(DriverPtr driver,
 	scrn->name = "RADEONSI";
 	scrn->Probe = NULL;
 
-	entity = xf86GetEntityInfo(entity_num);
-
 	/* Use all the functions from the xorg tracker */
 	xorg_tracker_set_functions(scrn);
     }
diff --git a/src/gallium/targets/xorg-i915/intel_xorg.c b/src/gallium/targets/xorg-i915/intel_xorg.c
index 32d4a548bb4..d8eb258b374 100644
--- a/src/gallium/targets/xorg-i915/intel_xorg.c
+++ b/src/gallium/targets/xorg-i915/intel_xorg.c
@@ -128,7 +128,6 @@ intel_xorg_pci_probe(DriverPtr driver,
 	  int entity_num, struct pci_device *device, intptr_t match_data)
 {
     ScrnInfoPtr scrn = NULL;
-    EntityInfoPtr entity;
 
     scrn = xf86ConfigPciEntity(scrn, 0, entity_num, intel_xorg_pci_devices,
 			       NULL, NULL, NULL, NULL, NULL);
@@ -138,8 +137,6 @@ intel_xorg_pci_probe(DriverPtr driver,
 	scrn->name = "modesetting";
 	scrn->Probe = NULL;
 
-	entity = xf86GetEntityInfo(entity_num);
-
 	/* Use all the functions from the xorg tracker */
 	xorg_tracker_set_functions(scrn);
     }
diff --git a/src/gallium/targets/xorg-nouveau/nouveau_xorg.c b/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
index 2324d24445a..454aea6d48b 100644
--- a/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
+++ b/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
@@ -125,7 +125,6 @@ nouveau_xorg_pci_probe(DriverPtr driver,
 	  int entity_num, struct pci_device *device, intptr_t match_data)
 {
     ScrnInfoPtr scrn = NULL;
-    EntityInfoPtr entity;
     struct nouveau_device *dev = NULL;
     char *busid;
     int chipset, ret;
@@ -185,8 +184,6 @@ nouveau_xorg_pci_probe(DriverPtr driver,
 	scrn->name = "nouveau2";
 	scrn->Probe = NULL;
 
-	entity = xf86GetEntityInfo(entity_num);
-
 	/* Use all the functions from the xorg tracker */
 	xorg_tracker_set_functions(scrn);
     }