[igt-dev] [PATCH i-g-t 2/2] lib/sysfs: s/kick_fbcon/bind_fbcon/

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala at linux.intel.com>

Rename kick_fbcon() into bind_fbcon() so that it's not so
confusing.

Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 lib/igt_core.c  | 4 ++--
 lib/igt_kmod.c  | 4 ++--
 lib/igt_sysfs.c | 4 ++--
 lib/igt_sysfs.h | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/igt_core.c b/lib/igt_core.c
index e52b806bdb01..5092a3f035c7 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -517,7 +517,7 @@ bool igt_exit_called;
 static void common_exit_handler(int sig)
 {
 	if (!igt_only_list_subtests()) {
-		kick_fbcon(true);
+		bind_fbcon(true);
 	}
 
 	/* When not killed by a signal check that igt_exit() has been properly
@@ -802,7 +802,7 @@ out:
 		exit(ret == -1 ? 0 : IGT_EXIT_INVALID);
 
 	if (!list_subtests) {
-		kick_fbcon(false);
+		bind_fbcon(false);
 		igt_kmsg(KMSG_INFO "%s: executing\n", command_str);
 		print_version();
 
diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
index bc1ace23ca2b..4f70e30d9de0 100644
--- a/lib/igt_kmod.c
+++ b/lib/igt_kmod.c
@@ -294,7 +294,7 @@ igt_i915_driver_load(const char *opts)
 		return IGT_EXIT_FAILURE;
 	}
 
-	kick_fbcon(true);
+	bind_fbcon(true);
 	igt_kmod_load("snd_hda_intel", NULL);
 
 	return IGT_EXIT_SUCCESS;
@@ -310,7 +310,7 @@ int
 igt_i915_driver_unload(void)
 {
 	/* unbind vt */
-	kick_fbcon(false);
+	bind_fbcon(false);
 
 	if (igt_kmod_is_loaded("snd_hda_intel")) {
 		igt_terminate_process(SIGTERM, "alsactl");
diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c
index 3b8308118432..8efe889bebcd 100644
--- a/lib/igt_sysfs.c
+++ b/lib/igt_sysfs.c
@@ -546,13 +546,13 @@ static void bind_con(const char *name, bool enable)
 }
 
 /**
- * kick_fbcon:
+ * bind_fbcon:
  * @enable: boolean value
  *
  * This functions enables/disables the text console running on top of the
  * framebuffer device.
  */
-void kick_fbcon(bool enable)
+void bind_fbcon(bool enable)
 {
 	/*
 	 * The vtcon bind interface seems somewhat broken. Possibly
diff --git a/lib/igt_sysfs.h b/lib/igt_sysfs.h
index 74e61060d224..2ce5b7bd841d 100644
--- a/lib/igt_sysfs.h
+++ b/lib/igt_sysfs.h
@@ -55,7 +55,7 @@ bool igt_sysfs_set_u32(int dir, const char *attr, uint32_t value);
 bool igt_sysfs_get_boolean(int dir, const char *attr);
 bool igt_sysfs_set_boolean(int dir, const char *attr, bool value);
 
-void kick_fbcon(bool enable);
+void bind_fbcon(bool enable);
 void kick_snd_hda_intel(void);
 
 #endif /* __IGT_SYSFS_H__ */
-- 
2.16.1