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

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

ACPI / dock: Pass ACPI device pointer to acpi_device_is_battery() 



Since we already know what the device's PNP IDs are when
acpi_device_is_battery() is called, it is not necessary to run
acpi_get_object_info() for the device in that function.  Instead, if
acpi_device_is_battery() is passed a pointer to a struct acpi_device
object, it can use the list of PNP IDs from that object, so make that
happen and modify the function's header accordingly

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1e2380cd

drivers/acpi/dock.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ void acpi_dock_add(struct acpi_device *adev) 
		dock_station->flags |= DOCK_IS_DOCK;

	if (acpi_ata_match(handle))

		dock_station->flags |= DOCK_IS_ATA;

	if (acpi_device_is_battery(handle))

	if (acpi_device_is_battery(adev))

		dock_station->flags |= DOCK_IS_BAT;



	ret = sysfs_create_group(&dd->dev.kobj, &dock_attribute_group);

drivers/acpi/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); 
int acpi_bind_one(struct device *dev, struct acpi_device *adev);

int acpi_unbind_one(struct device *dev);

bool acpi_device_is_present(struct acpi_device *adev);

bool acpi_device_is_battery(acpi_handle handle);

bool acpi_device_is_battery(struct acpi_device *adev);



/* --------------------------------------------------------------------------

                                  Power Resource

drivers/acpi/scan.c

+11 −13
Original line number Diff line number Diff line
@@ -1662,24 +1662,22 @@ bool acpi_bay_match(acpi_handle handle) 
	return acpi_ata_match(phandle);

}



bool acpi_device_is_battery(acpi_handle handle)

bool acpi_device_is_battery(struct acpi_device *adev)

{

	struct acpi_device_info *info;

	bool ret = false;



	if (!ACPI_SUCCESS(acpi_get_object_info(handle, &info)))

		return false;

	struct acpi_hardware_id *hwid;



	if (info->valid & ACPI_VALID_HID)

		ret = !strcmp("PNP0C0A", info->hardware_id.string);

	list_for_each_entry(hwid, &adev->pnp.ids, list)

		if (!strcmp("PNP0C0A", hwid->id))

			return true;



	kfree(info);

	return ret;

	return false;

}



static bool is_ejectable_bay(acpi_handle handle)

static bool is_ejectable_bay(struct acpi_device *adev)

{

	if (acpi_has_method(handle, "_EJ0") && acpi_device_is_battery(handle))

	acpi_handle handle = adev->handle;



	if (acpi_has_method(handle, "_EJ0") && acpi_device_is_battery(adev))

		return true;



	return acpi_bay_match(handle);
@@ -1989,7 +1987,7 @@ static void acpi_scan_init_hotplug(struct acpi_device *adev) 
{

	struct acpi_hardware_id *hwid;



	if (acpi_dock_match(adev->handle) || is_ejectable_bay(adev->handle)) {

	if (acpi_dock_match(adev->handle) || is_ejectable_bay(adev)) {

		acpi_dock_add(adev);

		return;

	}