Skip to content

Commit e632214

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.16/intel-thc' into for-linus
- fix for ACPI initialization (Wentao Guan)
2 parents 1767875 + bbd7a03 commit e632214

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,10 @@ static int quicki2c_acpi_get_dsd_property(struct acpi_device *adev, acpi_string
8282
{
8383
acpi_handle handle = acpi_device_handle(adev);
8484
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
85-
union acpi_object obj = { .type = type };
86-
struct acpi_object_list arg_list = {
87-
.count = 1,
88-
.pointer = &obj,
89-
};
9085
union acpi_object *ret_obj;
9186
acpi_status status;
9287

93-
status = acpi_evaluate_object(handle, dsd_method_name, &arg_list, &buffer);
88+
status = acpi_evaluate_object(handle, dsd_method_name, NULL, &buffer);
9489
if (ACPI_FAILURE(status)) {
9590
acpi_handle_err(handle,
9691
"Can't evaluate %s method: %d\n", dsd_method_name, status);

drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ EXPORT_SYMBOL_NS_GPL(thc_port_select, "INTEL_THC");
11211121

11221122
static u8 thc_get_spi_freq_div_val(struct thc_device *dev, u32 spi_freq_val)
11231123
{
1124-
int frequency[] = {
1124+
static const int frequency[] = {
11251125
THC_SPI_FREQUENCY_7M,
11261126
THC_SPI_FREQUENCY_15M,
11271127
THC_SPI_FREQUENCY_17M,
@@ -1130,7 +1130,7 @@ static u8 thc_get_spi_freq_div_val(struct thc_device *dev, u32 spi_freq_val)
11301130
THC_SPI_FREQUENCY_31M,
11311131
THC_SPI_FREQUENCY_41M,
11321132
};
1133-
u8 frequency_div[] = {
1133+
static const u8 frequency_div[] = {
11341134
THC_SPI_FRQ_DIV_2,
11351135
THC_SPI_FRQ_DIV_1,
11361136
THC_SPI_FRQ_DIV_7,

0 commit comments

Comments
 (0)