[igt-dev] [CI 7/8] lib/igt_sysfs: Simplify obtaining sysfs path
Michał Winiarski
michal.winiarski at intel.com
Thu Mar 14 12:50:49 UTC 2019
Now that we've extracted card index, we no longer have the need to
iterate over device nodes.
v2: Drop ret.
Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
---
lib/igt_sysfs.c | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c
index aa880775..f806f4fc 100644
--- a/lib/igt_sysfs.c
+++ b/lib/igt_sysfs.c
@@ -106,30 +106,13 @@ char *igt_sysfs_path(int device, char *path, int pathlen)
if (fstat(device, &st) || !S_ISCHR(st.st_mode))
return NULL;
- for (int n = 0; n < 16; n++) {
- int len, ret, maj, min;
- FILE *file;
+ snprintf(path, pathlen, "/sys/dev/char/%d:%d",
+ major(st.st_rdev), minor(st.st_rdev));
- len = snprintf(path, pathlen, "/sys/class/drm/card%d", n);
-
- sprintf(path + len, "/dev");
- file = fopen(path, "r");
- if (!file)
- continue;
-
- ret = fscanf(file, "%d:%d", &maj, &min);
- fclose(file);
-
- if (ret != 2 || major(st.st_rdev) != maj ||
- minor(st.st_rdev) != min)
- continue;
-
- path[len] = '\0';
-
- return path;
- }
+ if (access(path, F_OK))
+ return NULL;
- return NULL;
+ return path;
}
/**
--
2.20.1
More information about the igt-dev
mailing list