diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-03-04 04:19:12 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-03-05 21:03:54 +0200 |
| commit | 68fb7595bc16a9672ea20e86431763f833cf47a7 (patch) | |
| tree | ecc9ea0289aac7157d04b8f3fa2a7250bb8dd1bb | |
| parent | 987f58240c7841abc090a84ce8fa7ebfe8fd4985 (diff) | |
lib/sysfs: s/kick_fbcon/bind_fbcon/
Rename kick_fbcon() into bind_fbcon() so that it's not so
confusing.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | lib/igt_core.c | 4 | ||||
| -rw-r--r-- | lib/igt_kmod.c | 4 | ||||
| -rw-r--r-- | lib/igt_sysfs.c | 4 | ||||
| -rw-r--r-- | 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 e52b806b..5092a3f0 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 bc1ace23..4f70e30d 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 3b830811..8efe889b 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 74e61060..2ce5b7bd 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__ */ |