From 08b84d72878e43401e99059c3c926dfa42a360c3 Mon Sep 17 00:00:00 2001 From: Hans De Goede Date: Mon, 12 Dec 2016 17:03:13 +0100 Subject: [PATCH xserver 2/6] xfree86: Make OutputClassMatches take a xf86_platform_device Make OutputClassMatches directly take a xf86_platform_device as argument, rather then an index into xf86_platform_devices. This makes things easier for callers which already have a xf86_platform_device pointer. Reviewed-by: Adam Jackson Signed-off-by: Hans de Goede --- hw/xfree86/common/xf86platformBus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 16d934f..25a9040 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -214,9 +214,10 @@ MatchToken(const char *value, struct xorg_list *patterns, } static Bool -OutputClassMatches(const XF86ConfOutputClassPtr oclass, int index) +OutputClassMatches(const XF86ConfOutputClassPtr oclass, + struct xf86_platform_device *dev) { - char *driver = xf86_platform_odev_attributes(index)->driver; + char *driver = dev->attribs->driver; if (!MatchToken(driver, &oclass->match_driver, strcmp)) return FALSE; @@ -234,7 +235,7 @@ xf86OutputClassDriverList(int index, char *matches[], int nmatches) return 0; for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { - if (OutputClassMatches(cl, index)) { + if (OutputClassMatches(cl, &xf86_platform_devices[index])) { char *path = xf86_platform_odev_attributes(index)->path; xf86Msg(X_INFO, "Applying OutputClass \"%s\" to %s\n", -- 2.9.3