Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f9481ac authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-video' and 'acpi-dock' 

* acpi-cleanup:
  ACPI: Clean up memory allocations

* acpi-thermal:
  ACPI / thermal: Fix wrong variable usage in debug statement

* acpi-video:
  ACPI / video: Favor native backlight interface for ThinkPad Helix

* acpi-dock:
  ACPI / dock: Drop dock_device_ids[] table
parents fe107392 2d0acb4a ee17fdf2 997dd7fe 4e24ea2a

drivers/acpi/dock.c

+0 −6
Original line number Diff line number Diff line
@@ -51,12 +51,6 @@ MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to " 
	" the driver to wait for userspace to write the undock sysfs file "

	" before undocking");



static const struct acpi_device_id dock_device_ids[] = {

	{"LNXDOCK", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, dock_device_ids);



struct dock_station {

	acpi_handle handle;

	unsigned long last_dock_time;

drivers/acpi/osl.c

+1 −2
Original line number Diff line number Diff line
@@ -1219,10 +1219,9 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle) 
{

	struct semaphore *sem = NULL;



	sem = acpi_os_allocate(sizeof(struct semaphore));

	sem = acpi_os_allocate_zeroed(sizeof(struct semaphore));

	if (!sem)

		return AE_NO_MEMORY;

	memset(sem, 0, sizeof(struct semaphore));



	sema_init(sem, initial_units);

drivers/acpi/thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) 
			tz->trips.hot.flags.valid = 1;

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					"Found hot threshold [%lu]\n",

					tz->trips.critical.temperature));

					tz->trips.hot.temperature));

		}

	}

drivers/acpi/utils.c

+1 −2
Original line number Diff line number Diff line
@@ -164,11 +164,10 @@ acpi_extract_package(union acpi_object *package, 
	 * Validate output buffer.

	 */

	if (buffer->length == ACPI_ALLOCATE_BUFFER) {

		buffer->pointer = ACPI_ALLOCATE(size_required);

		buffer->pointer = ACPI_ALLOCATE_ZEROED(size_required);

		if (!buffer->pointer)

			return AE_NO_MEMORY;

		buffer->length = size_required;

		memset(buffer->pointer, 0, size_required);

	} else {

		if (buffer->length < size_required) {

			buffer->length = size_required;

drivers/acpi/video.c

+8 −0
Original line number Diff line number Diff line
@@ -487,6 +487,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { 
		DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Yoga 13"),

		},

	},

	{

	.callback = video_set_use_native_backlight,

	.ident = "Thinkpad Helix",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Helix"),

		},

	},

	{

	 .callback = video_set_use_native_backlight,

	 .ident = "Dell Inspiron 7520",