Commit e6322141 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.16/intel-thc' into for-linus 

- fix for ACPI initialization (Wentao Guan)
parents 17678759 bbd7a03d

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

+1 −6
Original line number Diff line number Diff line
@@ -82,15 +82,10 @@ static int quicki2c_acpi_get_dsd_property(struct acpi_device *adev, acpi_string 
{

	acpi_handle handle = acpi_device_handle(adev);

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object obj = { .type = type };

	struct acpi_object_list arg_list = {

		.count = 1,

		.pointer = &obj,

	};

	union acpi_object *ret_obj;

	acpi_status status;



	status = acpi_evaluate_object(handle, dsd_method_name, &arg_list, &buffer);

	status = acpi_evaluate_object(handle, dsd_method_name, NULL, &buffer);

	if (ACPI_FAILURE(status)) {

		acpi_handle_err(handle,

				"Can't evaluate %s method: %d\n", dsd_method_name, status);

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

+2 −2
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ EXPORT_SYMBOL_NS_GPL(thc_port_select, "INTEL_THC"); 


static u8 thc_get_spi_freq_div_val(struct thc_device *dev, u32 spi_freq_val)

{

	int frequency[] = {

	static const int frequency[] = {

		THC_SPI_FREQUENCY_7M,

		THC_SPI_FREQUENCY_15M,

		THC_SPI_FREQUENCY_17M,
@@ -1130,7 +1130,7 @@ static u8 thc_get_spi_freq_div_val(struct thc_device *dev, u32 spi_freq_val) 
		THC_SPI_FREQUENCY_31M,

		THC_SPI_FREQUENCY_41M,

	};

	u8 frequency_div[] = {

	static const u8 frequency_div[] = {

		THC_SPI_FRQ_DIV_2,

		THC_SPI_FRQ_DIV_1,

		THC_SPI_FRQ_DIV_7,