summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-10-11 21:34:27 -0400
committerAdam Jackson <ajax@redhat.com>2008-11-24 23:40:04 -0500
commitc251c0baae59714a6ac83b69cd106c08baa3613e (patch)
tree9784c1ff6ac31059afd2d86a25d50d6521ecb8c0 /hw
parent3e5281af17841cf50d0e52a728b12c6ab56e61df (diff)
Bus: remove special handling for init-only resources
This isn't used by any driver, nor has it ever been as far as I can tell.
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/common/xf86Bus.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 72b21dc92..fe035f4f8 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -158,8 +158,6 @@ void
xf86EntityInit(void)
{
int i;
- resPtr *pprev_next;
- resPtr res;
xf86AccessPtr pacc;
for (i = 0; i < xf86NumEntities; i++)
@@ -171,17 +169,6 @@ xf86EntityInit(void)
pacc->AccessEnable(pacc->arg);
xf86Entities[i]->entityInit(i,xf86Entities[i]->private);
pacc->AccessDisable(pacc->arg);
- /* remove init resources after init is processed */
- pprev_next = &Acc;
- res = Acc;
- while (res) {
- if (res->res_type & ResInit && (res->entityIndex == i)) {
- (*pprev_next) = res->next;
- xfree(res);
- } else
- pprev_next = &(res->next);
- res = (*pprev_next);
- }
}
}
@@ -1907,7 +1894,7 @@ xf86PostProbe(void)
{
memType val;
int i,j;
- resPtr resp, acc, tmp, resp_x, *pprev_next;
+ resPtr resp, acc, tmp, resp_x;
if (fbSlotClaimed) {
if (pciSlotClaimed || isaSlotClaimed
@@ -1927,17 +1914,7 @@ xf86PostProbe(void)
return;
}
}
- /* don't compare against ResInit - remove it from clone.*/
acc = tmp = xf86DupResList(Acc);
- pprev_next = &acc;
- while (tmp) {
- if (tmp->res_type & ResInit) {
- (*pprev_next) = tmp->next;
- xfree(tmp);
- } else
- pprev_next = &(tmp->next);
- tmp = (*pprev_next);
- }
for (i=0; i<xf86NumEntities; i++) {
resp = xf86Entities[i]->resources;