Fix inconsistent task function declarations

Tasks are defined inconsistently across the code base.

Signed-off-by: Stefan Reinauer <reinauer@google.com>
BRANCH=none
TEST=make buildall -j, also verify kevin boots to OS
BUG=none

Change-Id: I19a076395a9a8ee1e457e67a89d80d2f70277c97
Reviewed-on: https://chromium-review.googlesource.com/602739
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>

25 files changed, 27 insertions, 26 deletions

diff --git a/board/eve/led.c b/board/eve/led.c
index 6e64d6baea..a98a6d53e0 100644
--- a/board/eve/led.c
+++ b/board/eve/led.c
@@ -523,7 +523,7 @@ static void led_init(void)
 /* After pwm_pin_init() */
 DECLARE_HOOK(HOOK_INIT, led_init, HOOK_PRIO_DEFAULT);
 
-void led_task(void)
+void led_task(void *u)
 {
 	uint32_t start_time;
 	uint32_t task_duration;
diff --git a/board/zinger/board.c b/board/zinger/board.c
index d4b864763c..7505a8e684 100644
--- a/board/zinger/board.c
+++ b/board/zinger/board.c
@@ -70,7 +70,7 @@ static int check_rw_valid(void *rw_hash)
 	return 1;
 }
 
-extern void pd_task(void);
+extern void pd_task(void *u);
 
 int main(void)
 {
@@ -97,7 +97,7 @@ int main(void)
 		jump_to_rw();
 
 	/* background loop for PD events */
-	pd_task();
+	pd_task(NULL);
 
 	debug_printf("EXIT!\n");
 	/* we should never reach that point */
diff --git a/common/als.c b/common/als.c
index 6e80b23548..c671aacf12 100644
--- a/common/als.c
+++ b/common/als.c
@@ -28,7 +28,7 @@ int als_read(enum als_id id, int *lux)
 	return als[id].read(lux, af);
 }
 
-void als_task(void)
+void als_task(void *u)
 {
 	int i, val;
 	uint16_t *mapped = (uint16_t *)host_get_memmap(EC_MEMMAP_ALS);
diff --git a/common/charge_ramp.c b/common/charge_ramp.c
index a5928983fc..27b92f55f0 100644
--- a/common/charge_ramp.c
+++ b/common/charge_ramp.c
@@ -145,7 +145,7 @@ int chg_ramp_is_stable(void)
 	return ramp_st == CHG_RAMP_STABLE;
 }
 
-void chg_ramp_task(void)
+void chg_ramp_task(void *u)
 {
 	int task_wait_time = -1;
 	int i, lim;
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index 7464e446fc..56971cac48 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -614,7 +614,7 @@ static int get_desired_input_current(enum battery_present batt_present,
 }
 
 /* Main loop */
-void charger_task(void)
+void charger_task(void *u)
 {
 	int sleep_usec;
 	int need_static = 1;
diff --git a/common/console.c b/common/console.c
index bb4195d584..0a8fc3c679 100644
--- a/common/console.c
+++ b/common/console.c
@@ -650,7 +650,7 @@ void console_has_input(void)
 	task_wake(TASK_ID_CONSOLE);
 }
 
-void console_task(void)
+void console_task(void *u)
 {
 	console_init();
 
diff --git a/common/hooks.c b/common/hooks.c
index b8725a2467..27ee1c422f 100644
--- a/common/hooks.c
+++ b/common/hooks.c
@@ -162,7 +162,7 @@ int hook_call_deferred(const struct deferred_data *data, int us)
 	return EC_SUCCESS;
 }
 
-void hook_task(void)
+void hook_task(void *u)
 {
 	/* Periodic hooks will be called first time through the loop */
 	static uint64_t last_second = -SECOND;
diff --git a/common/host_command.c b/common/host_command.c
index 825515a66f..912a7b0ff4 100644
--- a/common/host_command.c
+++ b/common/host_command.c
@@ -414,7 +414,7 @@ static void host_command_init(void)
 #endif
 }
 
-void host_command_task(void)
+void host_command_task(void *u)
 {
 	timestamp_t t0, t1, t_recess;
 	t_recess.val = 0;
diff --git a/common/host_command_pd.c b/common/host_command_pd.c
index 2a60734570..a21ee33b94 100644
--- a/common/host_command_pd.c
+++ b/common/host_command_pd.c
@@ -207,7 +207,7 @@ static void pd_exchange_status(uint32_t ec_state)
 #endif /* USB_TCPM_WITH_OFF_CHIP_TCPC */
 }
 
-void pd_command_task(void)
+void pd_command_task(void *u)
 {
 	/* On startup exchange status with the PD */
 	pd_exchange_status(0);
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c
index 834fcf866d..03e0540f42 100644
--- a/common/keyboard_8042.c
+++ b/common/keyboard_8042.c
@@ -834,7 +834,7 @@ static void keyboard_special(uint16_t k)
 	}
 }
 
-void keyboard_protocol_task(void)
+void keyboard_protocol_task(void *u)
 {
 	int wait = -1;
 	int retries = 0;
diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c
index c4053d583e..23925fc218 100644
--- a/common/keyboard_scan.c
+++ b/common/keyboard_scan.c
@@ -664,7 +664,7 @@ void keyboard_scan_init(void)
 #endif /* CONFIG_KEYBOARD_BOOT_KEYS */
 }
 
-void keyboard_scan_task(void)
+void keyboard_scan_task(void *u)
 {
 	timestamp_t poll_deadline, start;
 	int wait_time;
diff --git a/common/motion_sense.c b/common/motion_sense.c
index 6f993b0f12..230523acee 100644
--- a/common/motion_sense.c
+++ b/common/motion_sense.c
@@ -718,7 +718,7 @@ static int motion_sense_process(struct motion_sensor_t *sensor,
  *    1 in the A/B(lid, display) and 1 in the C/D(base, keyboard)
  * Gyro Sensor (optional)
  */
-void motion_sense_task(void)
+void motion_sense_task(void *u)
 {
 	int i, ret, wait_us;
 	timestamp_t ts_begin_task, ts_end_task;
diff --git a/common/power_button_x86.c b/common/power_button_x86.c
index 8cfb8e685b..19870e0e49 100644
--- a/common/power_button_x86.c
+++ b/common/power_button_x86.c
@@ -373,7 +373,7 @@ static void state_machine(uint64_t tnow)
 	}
 }
 
-void power_button_task(void)
+void power_button_task(void *u)
 {
 	uint64_t t;
 	uint64_t tsleep;
diff --git a/common/rwsig.c b/common/rwsig.c
index 2d978e8e06..c2703234b6 100644
--- a/common/rwsig.c
+++ b/common/rwsig.c
@@ -255,7 +255,7 @@ void rwsig_continue(void)
 	task_set_event(TASK_ID_RWSIG, TASK_EVENT_CONTINUE, 0);
 }
 
-void rwsig_task(void)
+void rwsig_task(void *u)
 {
 	uint32_t evt;
 
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index 80ae429d52..2f701e6bfc 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -1640,7 +1640,7 @@ static void pd_init_tasks(void)
 }
 #endif /* CONFIG_COMMON_RUNTIME */
 
-void pd_task(void)
+void pd_task(void *u)
 {
 	int head;
 	int port = TASK_ID_TO_PD_PORT(task_get_current());
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c
index 0c620f7207..99e3470e18 100644
--- a/common/usb_pd_tcpc.c
+++ b/common/usb_pd_tcpc.c
@@ -858,7 +858,7 @@ int tcpc_run(int port, int evt)
 }
 
 #ifndef CONFIG_USB_POWER_DELIVERY
-void pd_task(void)
+void pd_task(void *u)
 {
 	int port = TASK_ID_TO_PD_PORT(task_get_current());
 	int timeout = 10*MSEC;
diff --git a/core/cortex-m/task.c b/core/cortex-m/task.c
index 6b978c9d33..2ff69de02e 100644
--- a/core/cortex-m/task.c
+++ b/core/cortex-m/task.c
@@ -32,7 +32,7 @@ typedef union {
 #define STACK_UNUSED_VALUE 0xdeadd00d
 
 /* declare task routine prototypes */
-#define TASK(n, r, d, s) int r(void *);
+#define TASK(n, r, d, s) void r(void *);
 void __idle(void);
 CONFIG_TASK_LIST
 CONFIG_TEST_TASK_LIST
diff --git a/core/cortex-m0/task.c b/core/cortex-m0/task.c
index 32f67e0d62..654711ff6d 100644
--- a/core/cortex-m0/task.c
+++ b/core/cortex-m0/task.c
@@ -32,7 +32,7 @@ typedef union {
 #define STACK_UNUSED_VALUE 0xdeadd00d
 
 /* declare task routine prototypes */
-#define TASK(n, r, d, s) void r(void);
+#define TASK(n, r, d, s) void r(void *);
 void __idle(void);
 CONFIG_TASK_LIST
 CONFIG_TEST_TASK_LIST
diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c
index e3676e292c..0c80f3c984 100644
--- a/core/minute-ia/task.c
+++ b/core/minute-ia/task.c
@@ -27,7 +27,7 @@
 #define STACK_UNUSED_VALUE 0xdeadd00d
 
 /* declare task routine prototypes */
-#define TASK(n, r, d, s) int r(void *);
+#define TASK(n, r, d, s) void r(void *);
 void __idle(void);
 CONFIG_TASK_LIST
 CONFIG_TEST_TASK_LIST
diff --git a/core/nds32/task.c b/core/nds32/task.c
index 8fab6d1ef8..54b7b5ed77 100644
--- a/core/nds32/task.c
+++ b/core/nds32/task.c
@@ -35,7 +35,7 @@ typedef union {
 #define STACK_UNUSED_VALUE 0xdeadd00d
 
 /* declare task routine prototypes */
-#define TASK(n, r, d, s) int r(void *);
+#define TASK(n, r, d, s) void r(void *);
 void __idle(void);
 CONFIG_TASK_LIST
 CONFIG_TEST_TASK_LIST
diff --git a/driver/bc12/bq24392.c b/driver/bc12/bq24392.c
index ec7f71d4bf..adae6d61c6 100644
--- a/driver/bc12/bq24392.c
+++ b/driver/bc12/bq24392.c
@@ -115,8 +115,9 @@ static void detect_or_power_down_ic(const int port)
 		power_down_ic(port);
 }
 
-void usb_charger_task(const int port)
+void usb_charger_task(void *u)
 {
+	const int port = (intptr_t)u;
 	uint32_t evt;
 
 	ASSERT(port >= 0 && port <= 2);
diff --git a/driver/bc12/pi3usb9281.c b/driver/bc12/pi3usb9281.c
index 4495b7065b..88f40778b8 100644
--- a/driver/bc12/pi3usb9281.c
+++ b/driver/bc12/pi3usb9281.c
@@ -388,7 +388,7 @@ static void bc12_detect(int port)
 	}
 }
 
-void usb_charger_task(void)
+void usb_charger_task(void *u)
 {
 	const int attach_mask = PI3USB9281_INT_ATTACH | PI3USB9281_INT_DETACH;
 	int port = (task_get_current() == TASK_ID_USB_CHG_P0 ? 0 : 1);
diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c
index c1b0eca8af..fa76c9b29e 100644
--- a/driver/charger/bd9995x.c
+++ b/driver/charger/bd9995x.c
@@ -1118,7 +1118,7 @@ void bd9995x_vbus_interrupt(enum gpio_signal signal)
 	task_wake(TASK_ID_USB_CHG);
 }
 
-void usb_charger_task(void)
+void usb_charger_task(void *u)
 {
 	static int initialized;
 	int changed, port, interrupts;
diff --git a/driver/touchpad_elan.c b/driver/touchpad_elan.c
index 8262a2dcdc..7ba75fa3aa 100644
--- a/driver/touchpad_elan.c
+++ b/driver/touchpad_elan.c
@@ -317,7 +317,7 @@ void elan_tp_interrupt(enum gpio_signal signal)
 	task_wake(TASK_ID_TOUCHPAD);
 }
 
-void elan_tp_task(void)
+void elan_tp_task(void *u)
 {
 	elan_tp_init();
 
diff --git a/power/common.c b/power/common.c
index e64e2b9a9b..381b1e0099 100644
--- a/power/common.c
+++ b/power/common.c
@@ -365,7 +365,7 @@ void chipset_exit_hard_off(void)
 /*****************************************************************************/
 /* Task function */
 
-void chipset_task(void)
+void chipset_task(void *u)
 {
 	enum power_state new_state;
 	static enum power_state last_state;