summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Short <keithshort@chromium.org>2022-03-31 22:31:45 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-04-01 16:05:21 +0000
commit85814a20f92141a0f635b257d58f59a744f63a93 (patch)
tree3e291f1be9d2b13afc22b9410cf00309955d1729
parentecf71d5dfc663e16ec298640b533d3db17213a0d (diff)
downloadchrome-ec-85814a20f92141a0f635b257d58f59a744f63a93.tar.gz
Revert "zephyr: brya: Convert HOOK_INIT to SYS_INIT"
This reverts commit 5a66d11d0f0170752805223642a627904ba52573. Reason for revert: b:227661993: EFS2 broken after SYS_INIT changes Original change's description: > zephyr: brya: Convert HOOK_INIT to SYS_INIT > > Convert HOOK_INIT to the equivalent SYS_INIT call. > > BUG=b:226434387 > BRANCH=none > TEST=zmake testall > > Signed-off-by: Keith Short <keithshort@chromium.org> > Change-Id: If4a3dca9c8ec920946589c717599d3db51838cf1 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3553842 > Reviewed-by: Abe Levkoy <alevkoy@chromium.org> Bug: b:226434387 Change-Id: Ic90758256b86f021fbb3d7e1652c8daf9fb41eda Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3564617 Tested-by: Keith Short <keithshort@chromium.org> Reviewed-by: Wai-Hong Tam <waihong@google.com> Commit-Queue: Keith Short <keithshort@chromium.org>
-rw-r--r--zephyr/projects/brya/kblight_hooks.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/zephyr/projects/brya/kblight_hooks.c b/zephyr/projects/brya/kblight_hooks.c
index eae3d56cd9..c56aeb5907 100644
--- a/zephyr/projects/brya/kblight_hooks.c
+++ b/zephyr/projects/brya/kblight_hooks.c
@@ -47,9 +47,8 @@ static void board_backlight_handler(struct ap_power_ev_callback *cb,
* Explicitly apply the board ID 1 *gpio.inc settings to pins that
* were reassigned on current boards.
*/
-static int set_board_id_1_gpios(const struct device *unused)
+static void set_board_id_1_gpios(void)
{
- ARG_UNUSED(unused);
static struct ap_power_ev_callback cb;
/*
@@ -61,9 +60,8 @@ static int set_board_id_1_gpios(const struct device *unused)
ap_power_ev_add_callback(&cb);
if (get_board_id() != 1)
- return 0;
+ return;
gpio_pin_configure_dt(GPIO_DT_FROM_NODELABEL(gpio_id_1_ec_kb_bl_en),
GPIO_OUTPUT_LOW);
- return 0;
}
-SYS_INIT(set_board_id_1_gpios, APPLICATION, HOOK_PRIO_FIRST);
+DECLARE_HOOK(HOOK_INIT, set_board_id_1_gpios, HOOK_PRIO_FIRST);