frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Adam Jackson 2008-10-11 21:34:27 -04:00
parent 3e5281af17
commit c251c0baae
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/xfree86/common/xf86Bus.c
View File

@ -158,8 +158,6 @@ void
xf86EntityInit(void) xf86EntityInit(void)
{ {
int i; int i;
resPtr *pprev_next;
resPtr res;
xf86AccessPtr pacc; xf86AccessPtr pacc;
for (i = 0; i < xf86NumEntities; i++) for (i = 0; i < xf86NumEntities; i++)
@ -171,17 +169,6 @@ xf86EntityInit(void)
pacc->AccessEnable(pacc->arg); pacc->AccessEnable(pacc->arg);
xf86Entities[i]->entityInit(i,xf86Entities[i]->private); xf86Entities[i]->entityInit(i,xf86Entities[i]->private);
pacc->AccessDisable(pacc->arg); 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; memType val;
int i,j; int i,j;
resPtr resp, acc, tmp, resp_x, *pprev_next; resPtr resp, acc, tmp, resp_x;
if (fbSlotClaimed) { if (fbSlotClaimed) {
if (pciSlotClaimed || isaSlotClaimed if (pciSlotClaimed || isaSlotClaimed
@ -1927,17 +1914,7 @@ xf86PostProbe(void)
return; return;
} }
} }
/* don't compare against ResInit - remove it from clone.*/
acc = tmp = xf86DupResList(Acc); 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++) { for (i=0; i<xf86NumEntities; i++) {
resp = xf86Entities[i]->resources; resp = xf86Entities[i]->resources;