geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xf86drm: rename drmSameDevice to drmCompareBusInfo 

Move away form the boolean name, change the return value
appropriately and check if either argument is NULL.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
main
Emil Velikov 2015-09-07 13:51:54 +01:00
parent a250fceaaa
commit bc2aca9e22
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xf86drm.c
View File

@ -2893,20 +2893,22 @@ static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
return 0; return 0;
} }
static int drmSameDevice(drmDevicePtr a, drmDevicePtr b) static int drmCompareBusInfo(drmDevicePtr a, drmDevicePtr b)
{ {
if (a == NULL || b == NULL)
return -1;
if (a->bustype != b->bustype) if (a->bustype != b->bustype)
return 0; return -1;
switch (a->bustype) { switch (a->bustype) {
case DRM_BUS_PCI: case DRM_BUS_PCI:
if (memcmp(a->businfo.pci, b->businfo.pci, sizeof(drmPciBusInfo)) == 0) return memcmp(a->businfo.pci, b->businfo.pci, sizeof(drmPciBusInfo));
return 1;
default: default:
break; break;
} }
return 0; return -1;
} }
static int drmGetNodeType(const char *name) static int drmGetNodeType(const char *name)
@ -3104,7 +3106,7 @@ int drmGetDevices(drmDevicePtr devices[], int max_devices)
for (j = i+1; j < node_count; j++) { for (j = i+1; j < node_count; j++) {
if (duplicated[i] || duplicated[j]) if (duplicated[i] || duplicated[j])
continue; continue;
if (drmSameDevice(&devs[i], &devs[j])) { if (drmCompareBusInfo(&devs[i], &devs[j]) == 0) {
duplicated[j] = 1; duplicated[j] = 1;
devs[i].available_nodes |= devs[j].available_nodes; devs[i].available_nodes |= devs[j].available_nodes;
node_type = log2(devs[j].available_nodes); node_type = log2(devs[j].available_nodes);