From 05b2e640eb1083497e05a900cf4d1ccb7b3e344f Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Fri, 23 Jun 2023 07:19:57 +0000
Subject: [PATCH] refactor: All SYS_INIT functions are void args.

---
 app/boards/arm/mikoto/pinmux.c       | 3 +--
 app/src/activity.c                   | 6 +++---
 app/src/backlight.c                  | 2 +-
 app/src/battery.c                    | 2 +-
 app/src/ble.c                        | 2 +-
 app/src/combo.c                      | 2 +-
 app/src/endpoints.c                  | 2 +-
 app/src/hog.c                        | 2 +-
 app/src/rgb_underglow.c              | 2 +-
 app/src/sensors.c                    | 2 +-
 app/src/split/bluetooth/central.c    | 2 +-
 app/src/split/bluetooth/peripheral.c | 2 +-
 app/src/split/bluetooth/service.c    | 2 +-
 app/src/usb.c                        | 2 +-
 app/src/usb_hid.c                    | 2 +-
 app/src/wpm.c                        | 2 +-
 16 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/boards/arm/mikoto/pinmux.c b/app/boards/arm/mikoto/pinmux.c
index 524aa17e..c34c2dc8 100644
--- a/app/boards/arm/mikoto/pinmux.c
+++ b/app/boards/arm/mikoto/pinmux.c
@@ -11,8 +11,7 @@
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/devicetree.h>
 
-static int pinmux_mikoto_init(const struct device *port) {
-    ARG_UNUSED(port);
+static int pinmux_mikoto_init(void) {
 
 #if CONFIG_BOARD_MIKOTO_520
     const struct device *p0 = DEVICE_DT_GET(DT_NODELABEL(gpio0));
diff --git a/app/src/activity.c b/app/src/activity.c
index 41fe2e15..57ddf891 100644
--- a/app/src/activity.c
+++ b/app/src/activity.c
@@ -74,8 +74,8 @@ void activity_work_handler(struct k_work *work) {
     } else
 #endif /* IS_ENABLED(CONFIG_ZMK_SLEEP) */
         if (inactive_time > MAX_IDLE_MS) {
-            set_state(ZMK_ACTIVITY_IDLE);
-        }
+        set_state(ZMK_ACTIVITY_IDLE);
+    }
 }
 
 K_WORK_DEFINE(activity_work, activity_work_handler);
@@ -84,7 +84,7 @@ void activity_expiry_function() { k_work_submit(&activity_work); }
 
 K_TIMER_DEFINE(activity_timer, activity_expiry_function, NULL);
 
-int activity_init() {
+int activity_init(void) {
     activity_last_uptime = k_uptime_get();
 
     k_timer_start(&activity_timer, K_SECONDS(1), K_SECONDS(1));
diff --git a/app/src/backlight.c b/app/src/backlight.c
index f633ddb7..7f87737d 100644
--- a/app/src/backlight.c
+++ b/app/src/backlight.c
@@ -78,7 +78,7 @@ static void backlight_save_work_handler(struct k_work *work) {
 static struct k_work_delayable backlight_save_work;
 #endif
 
-static int zmk_backlight_init(const struct device *_arg) {
+static int zmk_backlight_init(void) {
     if (!device_is_ready(backlight_dev)) {
         LOG_ERR("Backlight device \"%s\" is not ready", backlight_dev->name);
         return -ENODEV;
diff --git a/app/src/battery.c b/app/src/battery.c
index 87a25e08..5c369f96 100644
--- a/app/src/battery.c
+++ b/app/src/battery.c
@@ -84,7 +84,7 @@ static void zmk_battery_timer(struct k_timer *timer) {
 
 K_TIMER_DEFINE(battery_timer, zmk_battery_timer, NULL);
 
-static int zmk_battery_init(const struct device *_arg) {
+static int zmk_battery_init(void) {
 #if !DT_HAS_CHOSEN(zmk_battery)
     battery = device_get_binding("BATTERY");
 
diff --git a/app/src/ble.c b/app/src/ble.c
index 483bc9d7..aa2d321d 100644
--- a/app/src/ble.c
+++ b/app/src/ble.c
@@ -582,7 +582,7 @@ static void zmk_ble_ready(int err) {
     update_advertising();
 }
 
-static int zmk_ble_init(const struct device *_arg) {
+static int zmk_ble_init(void) {
     int err = bt_enable(NULL);
 
     if (err) {
diff --git a/app/src/combo.c b/app/src/combo.c
index 0d5c2a6e..d36f7fdd 100644
--- a/app/src/combo.c
+++ b/app/src/combo.c
@@ -537,7 +537,7 @@ ZMK_SUBSCRIPTION(combo, zmk_keycode_state_changed);
 
 DT_INST_FOREACH_CHILD(0, COMBO_INST)
 
-static int combo_init() {
+static int combo_init(void) {
     k_work_init_delayable(&timeout_task, combo_timeout_handler);
     DT_INST_FOREACH_CHILD(0, INITIALIZE_COMBO);
     return 0;
diff --git a/app/src/endpoints.c b/app/src/endpoints.c
index 138e790f..378a4b75 100644
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@@ -274,7 +274,7 @@ static struct zmk_endpoint_instance get_selected_instance(void) {
     return instance;
 }
 
-static int zmk_endpoints_init(const struct device *_arg) {
+static int zmk_endpoints_init(void) {
 #if IS_ENABLED(CONFIG_SETTINGS)
     settings_subsys_init();
 
diff --git a/app/src/hog.c b/app/src/hog.c
index 930714b0..46599ae8 100644
--- a/app/src/hog.c
+++ b/app/src/hog.c
@@ -261,7 +261,7 @@ int zmk_hog_send_consumer_report(struct zmk_hid_consumer_report_body *report) {
     return 0;
 };
 
-int zmk_hog_init(const struct device *_arg) {
+int zmk_hog_init(void) {
     static const struct k_work_queue_config queue_config = {.name = "HID Over GATT Send Work"};
     k_work_queue_start(&hog_work_q, hog_q_stack, K_THREAD_STACK_SIZEOF(hog_q_stack),
                        CONFIG_ZMK_BLE_THREAD_PRIORITY, &queue_config);
diff --git a/app/src/rgb_underglow.c b/app/src/rgb_underglow.c
index b80d4039..febe8015 100644
--- a/app/src/rgb_underglow.c
+++ b/app/src/rgb_underglow.c
@@ -239,7 +239,7 @@ static void zmk_rgb_underglow_save_state_work() {
 static struct k_work_delayable underglow_save_work;
 #endif
 
-static int zmk_rgb_underglow_init(const struct device *_arg) {
+static int zmk_rgb_underglow_init(void) {
     led_strip = DEVICE_DT_GET(STRIP_CHOSEN);
 
 #if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER)
diff --git a/app/src/sensors.c b/app/src/sensors.c
index 60f2bd2a..34fd49e2 100644
--- a/app/src/sensors.c
+++ b/app/src/sensors.c
@@ -140,7 +140,7 @@ static void zmk_sensors_init_item(uint8_t i) {
 
 #define SENSOR_INIT(idx, _t) zmk_sensors_init_item(idx);
 
-static int zmk_sensors_init(const struct device *_arg) {
+static int zmk_sensors_init(void) {
     LISTIFY(ZMK_KEYMAP_SENSORS_LEN, SENSOR_INIT, (), 0)
 
     return 0;
diff --git a/app/src/split/bluetooth/central.c b/app/src/split/bluetooth/central.c
index 860e89a5..b8bc75a7 100644
--- a/app/src/split/bluetooth/central.c
+++ b/app/src/split/bluetooth/central.c
@@ -685,7 +685,7 @@ int zmk_split_bt_invoke_behavior(uint8_t source, struct zmk_behavior_binding *bi
     return split_bt_invoke_behavior_payload(wrapper);
 }
 
-int zmk_split_bt_central_init(const struct device *_arg) {
+static int zmk_split_bt_central_init(void) {
     k_work_queue_start(&split_central_split_run_q, split_central_split_run_q_stack,
                        K_THREAD_STACK_SIZEOF(split_central_split_run_q_stack),
                        CONFIG_ZMK_BLE_THREAD_PRIORITY, NULL);
diff --git a/app/src/split/bluetooth/peripheral.c b/app/src/split/bluetooth/peripheral.c
index 1d649f71..6b48c573 100644
--- a/app/src/split/bluetooth/peripheral.c
+++ b/app/src/split/bluetooth/peripheral.c
@@ -134,7 +134,7 @@ static struct bt_conn_cb conn_callbacks = {
 
 bool zmk_split_bt_peripheral_is_connected() { return is_connected; }
 
-static int zmk_peripheral_ble_init(const struct device *_arg) {
+static int zmk_peripheral_ble_init(void) {
     int err = bt_enable(NULL);
 
     if (err) {
diff --git a/app/src/split/bluetooth/service.c b/app/src/split/bluetooth/service.c
index 620df53e..fc174d23 100644
--- a/app/src/split/bluetooth/service.c
+++ b/app/src/split/bluetooth/service.c
@@ -227,7 +227,7 @@ int zmk_split_bt_sensor_triggered(uint8_t sensor_index,
 }
 #endif /* ZMK_KEYMAP_HAS_SENSORS */
 
-int service_init(const struct device *_arg) {
+static int service_init(void) {
     static const struct k_work_queue_config queue_config = {
         .name = "Split Peripheral Notification Queue"};
     k_work_queue_start(&service_work_q, service_q_stack, K_THREAD_STACK_SIZEOF(service_q_stack),
diff --git a/app/src/usb.c b/app/src/usb.c
index cf04ef46..128843f3 100644
--- a/app/src/usb.c
+++ b/app/src/usb.c
@@ -51,7 +51,7 @@ void usb_status_cb(enum usb_dc_status_code status, const uint8_t *params) {
     k_work_submit(&usb_status_notifier_work);
 };
 
-static int zmk_usb_init(const struct device *_arg) {
+static int zmk_usb_init(void) {
     int usb_enable_ret;
 
     usb_enable_ret = usb_enable(usb_status_cb);
diff --git a/app/src/usb_hid.c b/app/src/usb_hid.c
index f46c70a0..0afc4110 100644
--- a/app/src/usb_hid.c
+++ b/app/src/usb_hid.c
@@ -48,7 +48,7 @@ int zmk_usb_hid_send_report(const uint8_t *report, size_t len) {
     }
 }
 
-static int zmk_usb_hid_init(const struct device *_arg) {
+static int zmk_usb_hid_init(void) {
     hid_dev = device_get_binding("HID_0");
     if (hid_dev == NULL) {
         LOG_ERR("Unable to locate HID device");
diff --git a/app/src/wpm.c b/app/src/wpm.c
index 00a5942e..d906665a 100644
--- a/app/src/wpm.c
+++ b/app/src/wpm.c
@@ -72,7 +72,7 @@ void wpm_expiry_function() { k_work_submit(&wpm_work); }
 
 K_TIMER_DEFINE(wpm_timer, wpm_expiry_function, NULL);
 
-int wpm_init() {
+static int wpm_init(void) {
     wpm_state = 0;
     wpm_update_counter = 0;
     k_timer_start(&wpm_timer, K_SECONDS(WPM_UPDATE_INTERVAL_SECONDS),