diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-10-11 21:44:16 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-24 23:40:05 -0500 |
| commit | eb5ae45127fa9f08f0badec7e21f8c26c9c7c969 (patch) | |
| tree | c54771bc9c3834ed0bd56d5af3d704e6995c00e2 | |
| parent | ee8b5cf94c2a9f8526a3bb5011ebb10f3246a4d9 (diff) | |
Bus: Simplify a failure case (that pretty much never happens)
| -rw-r--r-- | hw/xfree86/common/xf86Bus.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 1316dec29..7730a41bd 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -1716,28 +1716,6 @@ xf86SetOperatingState(resList list, int entityIndex, int mask) /* * Stage specific code */ - /* - * ProcessEstimatedConflicts() -- Do something about driver-registered - * resources that conflict with estimated resources. For now, just register - * them with a logged warning. - */ - -/* - * xf86ClaimFixedResources() -- This function gets called from the - * driver Probe() function to claim fixed resources. - */ -static void -resError(resList list) -{ - FatalError("A driver tried to allocate the %s %sresource at \n" - "0x%lx:0x%lx which conflicted with another resource. Send the\n" - "output of the server to %s. Please \n" - "specify your computer hardware as closely as possible.\n", - ResIsBlock(list)?"Block":"Sparse", - ResIsMem(list)?"Mem":"Io", - ResIsBlock(list)?list->rBegin:list->rBase, - ResIsBlock(list)?list->rEnd:list->rMask,BUILDERADDR); -} /* * xf86ClaimFixedResources() is used to allocate non-relocatable resources. @@ -1761,7 +1739,7 @@ xf86ClaimFixedResources(resList list, int entityIndex) case ResExclusive: if (!xf86ChkConflict(&range, entityIndex)) { Acc = xf86AddResToList(Acc, &range, entityIndex); - } else resError(&range); /* no return */ + } else FatalError("xf86ClaimFixedResources conflict\n"); break; case ResShared: /* at this stage the resources are just added to the |