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

Commit f4fa0e01 authored by Toshi Kani's avatar Toshi Kani Committed by Rafael J. Wysocki
Browse files

ACPI: Remove unused lockable in acpi_device_flags 



Removed lockable in struct acpi_device_flags since it is no
longer used by any code. acpi_bus_hot_remove_device() cannot
use this flag because acpi_bus_trim() frees up its acpi_device
object. Furthermore, the dock driver calls _LCK method without
using this lockable flag.

Signed-off-by: default avatarToshi Kani <toshi.kani@hp.com>
Reviewed-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b3c450c3

drivers/acpi/scan.c

+0 −5
Original line number Diff line number Diff line
@@ -1017,11 +1017,6 @@ static int acpi_bus_get_flags(struct acpi_device *device) 
			device->flags.ejectable = 1;

	}



	/* Presence of _LCK indicates 'lockable' */

	status = acpi_get_handle(device->handle, "_LCK", &temp);

	if (ACPI_SUCCESS(status))

		device->flags.lockable = 1;



	/* Power resources cannot be power manageable. */

	if (device->device_type == ACPI_BUS_TYPE_POWER)

		return 0;

include/acpi/acpi_bus.h

+1 −2
Original line number Diff line number Diff line
@@ -144,12 +144,11 @@ struct acpi_device_flags { 
	u32 bus_address:1;

	u32 removable:1;

	u32 ejectable:1;

	u32 lockable:1;

	u32 suprise_removal_ok:1;

	u32 power_manageable:1;

	u32 performance_manageable:1;

	u32 eject_pending:1;

	u32 reserved:23;

	u32 reserved:24;

};



/* File System */