summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2012-11-02 03:57:39 +0000
committerBen Skeggs <bskeggs@redhat.com>2012-11-05 19:19:48 +1000
commit47457fbd5006070ea9a06238a5a69ca8167dac77 (patch)
tree08899a9cad4f5887857ea567cfbd7f950c2ec9ed
parent20995bb5920021668b8b607f886201c643ee0e9a (diff)
downloadxorg-driver-xf86-video-nouveau-47457fbd5006070ea9a06238a5a69ca8167dac77.tar.gz
nouveau: Remove unneeded xf86GetEntityInfo()
Retrieving the whole entity information is not needed as we only use the index - stored already in entity_num Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--src/nv_driver.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 9b5b9d6..c885e73 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -261,7 +261,6 @@ NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev,
{ -1, -1, NULL }
};
struct nouveau_device *dev = NULL;
- EntityInfoPtr pEnt = NULL;
ScrnInfoPtr pScrn = NULL;
drmVersion *version;
int chipset, ret;
@@ -340,10 +339,8 @@ NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev,
pScrn->FreeScreen = NVFreeScreen;
xf86SetEntitySharable(entity_num);
-
- pEnt = xf86GetEntityInfo(entity_num);
- xf86SetEntityInstanceForScreen(pScrn, pEnt->index, xf86GetNumEntityInstances(pEnt->index) - 1);
- free(pEnt);
+ xf86SetEntityInstanceForScreen(pScrn, entity_num,
+ xf86GetNumEntityInstances(entity_num) - 1);
return TRUE;
}