[igt-dev] [PATCH i-g-t 4/8] params open with path return

Juha-Pekka Heikkila
2020-04-21T16:17:35Z

From: Jani Nikula <jani.nikula@intel.com>

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
---
lib/igt_params.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/igt_params.c b/lib/igt_params.c
index b5ac1266..fe4b1df3 100644
--- a/lib/igt_params.c
+++ b/lib/igt_params.c
@@ -107,17 +107,7 @@ static void igt_params_save(int dir, const char *path, const char *name)
module_params = data;
}

-/**
- * igt_params_open:
- * @device: fd of the device
- *
- * This opens the module parameters directory (under sysfs) corresponding
- * to the device for use with igt_sysfs_set() and igt_sysfs_get().
- *
- * Returns:
- * The directory fd, or -1 on failure.
- */
-int igt_params_open(int device)
+static int __igt_params_open(int device, char **outpath)
{
int dir, params = -1;

@@ -141,11 +131,28 @@ int igt_params_open(int device)

sprintf(path, "/sys/module/%s/parameters", name);
params = open(path, O_RDONLY);
+ if (params >= 0 && outpath)
+ *outpath = strdup(path);
}

return params;
}

+/**
+ * igt_params_open:
+ * @device: fd of the device
+ *
+ * This opens the module parameters directory (under sysfs) corresponding
+ * to the device for use with igt_sysfs_set() and igt_sysfs_get().
+ *
+ * Returns:
+ * The directory fd, or -1 on failure.
+ */
+int igt_params_open(int device)
+{
+ return __igt_params_open(device, NULL);
+}
+
/**
* igt_params_set:
* @device: fd of the device
--
2.17.1