diff --git a/src/clevo_acpi.c b/src/clevo_acpi.c
index e1abd8f..f8f5442 100644
--- a/src/clevo_acpi.c
+++ b/src/clevo_acpi.c
@@ -32,9 +32,9 @@ struct clevo_acpi_driver_data_t {
 
 static struct clevo_acpi_driver_data_t *active_driver_data = NULL;
 
-static u32 clevo_acpi_evaluate(struct acpi_device *device, u8 cmd, u32 arg, union acpi_object **result)
+static int clevo_acpi_evaluate(struct acpi_device *device, u8 cmd, u32 arg, union acpi_object **result)
 {
-	u32 status;
+	int status;
 	acpi_handle handle;
 	u64 dsm_rev_dummy = 0x00; // Dummy 0 value since not used
 	u64 dsm_func = cmd;
@@ -79,9 +79,9 @@ static u32 clevo_acpi_evaluate(struct acpi_device *device, u8 cmd, u32 arg, unio
 	return status;
 }
 
-u32 clevo_acpi_interface_method_call(u8 cmd, u32 arg, union acpi_object **result_value)
+int clevo_acpi_interface_method_call(u8 cmd, u32 arg, union acpi_object **result_value)
 {
-	u32 status = 0;
+	int status = 0;
 
 	if (!IS_ERR_OR_NULL(active_driver_data)) {
 		status = clevo_acpi_evaluate(active_driver_data->adev, cmd, arg, result_value);
@@ -141,7 +141,7 @@ void clevo_acpi_notify(struct acpi_device *device, u32 event)
 {
 	u32 event_value;
 	union acpi_object *out_obj;
-	u32 status;
+	int status;
 	// struct clevo_acpi_driver_data_t *clevo_acpi_driver_data;
 
 	status = clevo_acpi_evaluate(device, 0x01, 0, &out_obj);
diff --git a/src/clevo_interfaces.h b/src/clevo_interfaces.h
index fabeff5..9b87a6a 100644
--- a/src/clevo_interfaces.h
+++ b/src/clevo_interfaces.h
@@ -72,14 +72,14 @@
 struct clevo_interface_t {
 	char *string_id;
 	void (*event_callb)(u32);
-	u32 (*method_call)(u8, u32, union acpi_object **);
+	int (*method_call)(u8, u32, union acpi_object **);
 };
 
-u32 clevo_keyboard_add_interface(struct clevo_interface_t *new_interface);
-u32 clevo_keyboard_remove_interface(struct clevo_interface_t *interface);
-u32 clevo_evaluate_method(u8 cmd, u32 arg, u32 *result);
-u32 clevo_evaluate_method2(u8 cmd, u32 arg, union acpi_object **result);
-u32 clevo_get_active_interface_id(char **id_str);
+int clevo_keyboard_add_interface(struct clevo_interface_t *new_interface);
+int clevo_keyboard_remove_interface(struct clevo_interface_t *interface);
+int clevo_evaluate_method(u8 cmd, u32 arg, u32 *result);
+int clevo_evaluate_method2(u8 cmd, u32 arg, union acpi_object **result);
+int clevo_get_active_interface_id(char **id_str);
 
 #define MODULE_ALIAS_CLEVO_WMI() \
 	MODULE_ALIAS("wmi:" CLEVO_WMI_EVENT_GUID); \
diff --git a/src/clevo_keyboard.h b/src/clevo_keyboard.h
index 7269017..8aea994 100644
--- a/src/clevo_keyboard.h
+++ b/src/clevo_keyboard.h
@@ -106,7 +106,7 @@ static struct kbd_backlight_mode_t {
         { .key = 7, .value = 0xB0000000, .name = "WAVE"}
 };
 
-u32 clevo_evaluate_method2(u8 cmd, u32 arg, union acpi_object **result)
+int clevo_evaluate_method2(u8 cmd, u32 arg, union acpi_object **result)
 {
 	if (IS_ERR_OR_NULL(active_clevo_interface)) {
 		pr_err("clevo_keyboard: no active interface while attempting cmd %02x arg %08x\n", cmd, arg);
@@ -116,9 +116,9 @@ u32 clevo_evaluate_method2(u8 cmd, u32 arg, union acpi_object **result)
 }
 EXPORT_SYMBOL(clevo_evaluate_method2);
 
-u32 clevo_evaluate_method(u8 cmd, u32 arg, u32 *result)
+int clevo_evaluate_method(u8 cmd, u32 arg, u32 *result)
 {
-	u32 status = 0;
+	int status = 0;
 	union acpi_object *out_obj;
 
 	status = clevo_evaluate_method2(cmd, arg, &out_obj);
@@ -140,7 +140,7 @@ u32 clevo_evaluate_method(u8 cmd, u32 arg, u32 *result)
 }
 EXPORT_SYMBOL(clevo_evaluate_method);
 
-u32 clevo_get_active_interface_id(char **id_str)
+int clevo_get_active_interface_id(char **id_str)
 {
 	if (IS_ERR_OR_NULL(active_clevo_interface))
 		return -ENODEV;
@@ -385,7 +385,7 @@ static struct tuxedo_keyboard_driver clevo_keyboard_driver = {
 	.key_map = clevo_keymap,
 };
 
-u32 clevo_keyboard_add_interface(struct clevo_interface_t *new_interface)
+int clevo_keyboard_add_interface(struct clevo_interface_t *new_interface)
 {
 	mutex_lock(&clevo_keyboard_interface_modification_lock);
 
@@ -423,7 +423,7 @@ u32 clevo_keyboard_add_interface(struct clevo_interface_t *new_interface)
 }
 EXPORT_SYMBOL(clevo_keyboard_add_interface);
 
-u32 clevo_keyboard_remove_interface(struct clevo_interface_t *interface)
+int clevo_keyboard_remove_interface(struct clevo_interface_t *interface)
 {
 	mutex_lock(&clevo_keyboard_interface_modification_lock);
 
diff --git a/src/clevo_leds.h b/src/clevo_leds.h
index c3242eb..4abe589 100644
--- a/src/clevo_leds.h
+++ b/src/clevo_leds.h
@@ -276,7 +276,7 @@ static struct led_classdev_mc clevo_mcled_cdevs[3] = {
 int clevo_leds_init(struct platform_device *dev)
 {
 	int ret;
-	u32 status;
+	int status;
 	union acpi_object *result;
 	u32 result_fallback;
 
diff --git a/src/clevo_wmi.c b/src/clevo_wmi.c
index f7e0186..51adaaa 100644
--- a/src/clevo_wmi.c
+++ b/src/clevo_wmi.c
@@ -30,7 +30,7 @@ static int clevo_wmi_evaluate(u32 wmi_method_id, u32 wmi_arg, union acpi_object
 	struct acpi_buffer acpi_buffer_out = { ACPI_ALLOCATE_BUFFER, NULL };
 	union acpi_object *acpi_result;
 	acpi_status status_acpi;
-	u32 return_status = 0;
+	int return_status = 0;
 
 	status_acpi =
 		wmi_evaluate_method(CLEVO_WMI_METHOD_GUID, 0x00, wmi_method_id,
@@ -55,7 +55,7 @@ static int clevo_wmi_evaluate(u32 wmi_method_id, u32 wmi_arg, union acpi_object
 	return return_status;
 }
 
-u32 clevo_wmi_interface_method_call(u8 cmd, u32 arg, union acpi_object **result_value)
+int clevo_wmi_interface_method_call(u8 cmd, u32 arg, union acpi_object **result_value)
 {
 	return clevo_wmi_evaluate(cmd, arg, result_value);
 }
@@ -71,7 +71,7 @@ static int clevo_wmi_probe(struct wmi_device *wdev)
 static int clevo_wmi_probe(struct wmi_device *wdev, const void *dummy_context)
 #endif
 {
-	u32 status;
+	int status;
 	union acpi_object *out_obj;
 
 	pr_debug("clevo_wmi driver probe\n");
@@ -126,7 +126,7 @@ static void clevo_wmi_notify(struct wmi_device *wdev, union acpi_object *dummy)
 {
 	u32 event_value;
 	union acpi_object *out_obj;
-	u32 status;
+	int status;
 
 	status = clevo_wmi_evaluate(0x01, 0, &out_obj);
 	if (!status) {