Remove xf86FormatPciBusNumber from API, inline the one place its used
Found no calls from current driver modules Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
6450f6ca7e
commit
b967bf2af2
|
@ -104,7 +104,6 @@ extern _X_EXPORT Bool xf86ParsePciBusString(const char *busID, int *bus,
|
|||
int *device, int *func);
|
||||
extern _X_EXPORT Bool xf86ComparePciBusString(const char *busID, int bus,
|
||||
int device, int func);
|
||||
extern _X_EXPORT void xf86FormatPciBusNumber(int busnum, char *buffer);
|
||||
extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci);
|
||||
extern _X_EXPORT Bool xf86CheckPciMemBase(struct pci_device * pPci,
|
||||
memType base);
|
||||
|
|
|
@ -82,16 +82,6 @@ static struct pci_slot_match xf86IsolateDevice = {
|
|||
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0
|
||||
};
|
||||
|
||||
void
|
||||
xf86FormatPciBusNumber(int busnum, char *buffer)
|
||||
{
|
||||
/* 'buffer' should be at least 8 characters long */
|
||||
if (busnum < 256)
|
||||
sprintf(buffer, "%d", busnum);
|
||||
else
|
||||
sprintf(buffer, "%d@%d", busnum & 0x00ff, busnum >> 8);
|
||||
}
|
||||
|
||||
/*
|
||||
* xf86Bus.c interface
|
||||
*/
|
||||
|
@ -1346,7 +1336,12 @@ xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
|
|||
|
||||
pVideo = (struct pci_device *) busData;
|
||||
|
||||
xf86FormatPciBusNumber(pVideo->bus, busnum);
|
||||
if (pVideo->bus < 256)
|
||||
snprintf(busnum, sizeof(busnum), "%d", pVideo->bus);
|
||||
else
|
||||
snprintf(busnum, sizeof(busnum), "%d@%d",
|
||||
pVideo->bus & 0x00ff, pVideo->bus >> 8);
|
||||
|
||||
XNFasprintf(&GDev->busID, "PCI:%s:%d:%d",
|
||||
busnum, pVideo->dev, pVideo->func);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user