From 1f8b5a66b35305623b97a8a514d2ca0443721ded Mon Sep 17 00:00:00 2001 From: Christoffer Sandberg Date: Mon, 7 Dec 2020 10:59:10 +0100 Subject: [PATCH] clevo_interfaces: Move resource ID defs --- src/clevo_acpi.c | 2 -- src/clevo_interfaces.h | 7 +++++++ src/clevo_wmi.c | 4 ---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/clevo_acpi.c b/src/clevo_acpi.c index fbc5b48..b278298 100644 --- a/src/clevo_acpi.c +++ b/src/clevo_acpi.c @@ -24,8 +24,6 @@ #include "clevo_interfaces.h" #define DRIVER_NAME "clevo_acpi" -#define CLEVO_ACPI_RESOURCE_HID "CLV0001" -#define CLEVO_ACPI_DSM_UUID "93f224e4-fbdc-4bbf-add6-db71bdc0afad" struct clevo_acpi_driver_data_t { struct acpi_device *adev; diff --git a/src/clevo_interfaces.h b/src/clevo_interfaces.h index 0bf06ac..2011f5f 100644 --- a/src/clevo_interfaces.h +++ b/src/clevo_interfaces.h @@ -22,6 +22,13 @@ #include +#define CLEVO_WMI_EVENT_GUID "ABBC0F6B-8EA1-11D1-00A0-C90629100000" +#define CLEVO_WMI_EMAIL_GUID "ABBC0F6C-8EA1-11D1-00A0-C90629100000" +#define CLEVO_WMI_METHOD_GUID "ABBC0F6D-8EA1-11D1-00A0-C90629100000" + +#define CLEVO_ACPI_RESOURCE_HID "CLV0001" +#define CLEVO_ACPI_DSM_UUID "93f224e4-fbdc-4bbf-add6-db71bdc0afad" + // The clevo get commands expect no parameters #define CLEVO_CMD_GET_FANINFO1 0x63 #define CLEVO_CMD_GET_FANINFO2 0x64 diff --git a/src/clevo_wmi.c b/src/clevo_wmi.c index c945ae8..20f6585 100644 --- a/src/clevo_wmi.c +++ b/src/clevo_wmi.c @@ -24,10 +24,6 @@ #include #include "clevo_interfaces.h" -#define CLEVO_WMI_EVENT_GUID "ABBC0F6B-8EA1-11D1-00A0-C90629100000" -#define CLEVO_WMI_EMAIL_GUID "ABBC0F6C-8EA1-11D1-00A0-C90629100000" -#define CLEVO_WMI_METHOD_GUID "ABBC0F6D-8EA1-11D1-00A0-C90629100000" - static int clevo_wmi_evaluate(u32 wmi_method_id, u32 wmi_arg, u32 *result) { struct acpi_buffer acpi_buffer_in = { (acpi_size)sizeof(wmi_arg),