summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJoshua Stein <jcs@cvs.openbsd.org>2019-03-06 15:32:39 +0000
committerJoshua Stein <jcs@cvs.openbsd.org>2019-03-06 15:32:39 +0000
commitf1a9a6a1ceaa5d395d25da30ba9d94fa6dab85d2 (patch)
tree1355e2207934f20da2a5b967c8e3c1544461f85d /sys
parent1b3d0395cf8d900ab007ce1428d56d7ad604a503 (diff)
thinkpad_[gs]et_backlight -> thinkpad_[gs]et_kbd_backlight
make it clear these are dealing with keyboard backlight and not screen backlight
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/acpi/acpithinkpad.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c
index 826030bad6a..9ae5e7f6f52 100644
--- a/sys/dev/acpi/acpithinkpad.c
+++ b/sys/dev/acpi/acpithinkpad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpithinkpad.c,v 1.61 2018/07/01 19:40:49 mlarkin Exp $ */
+/* $OpenBSD: acpithinkpad.c,v 1.62 2019/03/06 15:32:38 jcs Exp $ */
/*
* Copyright (c) 2008 joshua stein <jcs@openbsd.org>
*
@@ -161,8 +161,8 @@ int thinkpad_activate(struct device *, int);
/* wscons hook functions */
void thinkpad_get_thinklight(struct acpithinkpad_softc *);
void thinkpad_set_thinklight(void *, int);
-int thinkpad_get_backlight(struct wskbd_backlight *);
-int thinkpad_set_backlight(struct wskbd_backlight *);
+int thinkpad_get_kbd_backlight(struct wskbd_backlight *);
+int thinkpad_set_kbd_backlight(struct wskbd_backlight *);
extern int (*wskbd_get_backlight)(struct wskbd_backlight *);
extern int (*wskbd_set_backlight)(struct wskbd_backlight *);
void thinkpad_get_brightness(struct acpithinkpad_softc *);
@@ -299,14 +299,14 @@ thinkpad_attach(struct device *parent, struct device *self, void *aux)
0, NULL, &sc->sc_thinklight) == 0) {
sc->sc_thinklight_get = "KLCG";
sc->sc_thinklight_set = "KLCS";
- wskbd_get_backlight = thinkpad_get_backlight;
- wskbd_set_backlight = thinkpad_set_backlight;
+ wskbd_get_backlight = thinkpad_get_kbd_backlight;
+ wskbd_set_backlight = thinkpad_set_kbd_backlight;
} else if (aml_evalinteger(sc->sc_acpi, sc->sc_devnode, "MLCG",
0, NULL, &sc->sc_thinklight) == 0) {
sc->sc_thinklight_get = "MLCG";
sc->sc_thinklight_set = "MLCS";
- wskbd_get_backlight = thinkpad_get_backlight;
- wskbd_set_backlight = thinkpad_set_backlight;
+ wskbd_get_backlight = thinkpad_get_kbd_backlight;
+ wskbd_set_backlight = thinkpad_set_kbd_backlight;
}
if (aml_evalinteger(sc->sc_acpi, sc->sc_devnode, "PBLG",
@@ -620,7 +620,7 @@ thinkpad_set_thinklight(void *arg0, int arg1)
}
int
-thinkpad_get_backlight(struct wskbd_backlight *kbl)
+thinkpad_get_kbd_backlight(struct wskbd_backlight *kbl)
{
struct acpithinkpad_softc *sc = acpithinkpad_cd.cd_devs[0];
@@ -637,7 +637,7 @@ thinkpad_get_backlight(struct wskbd_backlight *kbl)
}
int
-thinkpad_set_backlight(struct wskbd_backlight *kbl)
+thinkpad_set_kbd_backlight(struct wskbd_backlight *kbl)
{
struct acpithinkpad_softc *sc = acpithinkpad_cd.cd_devs[0];
int maxval;