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

Commit 70122e3d authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki
Browse files

intel_menlow: convert acpi_get_handle() to acpi_has_method() 



acpi_has_method() is a new ACPI API introduced to check
the existence of an ACPI control method.

It can be used to replace acpi_get_handle() in the case that
1. the calling function doesn't need the ACPI handle of the control method.
and
2. the calling function doesn't care the reason why the method is unavailable.

Convert acpi_get_handle() to acpi_has_method()
in drivers/platform/x86/intel_menlow.c in this patch.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
CC: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent dd13b9a6

drivers/platform/x86/intel_menlow.c

+2 −6
Original line number Diff line number Diff line
@@ -156,19 +156,15 @@ static struct thermal_cooling_device_ops memory_cooling_ops = { 
static int intel_menlow_memory_add(struct acpi_device *device)

{

	int result = -ENODEV;

	acpi_status status = AE_OK;

	acpi_handle dummy;

	struct thermal_cooling_device *cdev;



	if (!device)

		return -EINVAL;



	status = acpi_get_handle(device->handle, MEMORY_GET_BANDWIDTH, &dummy);

	if (ACPI_FAILURE(status))

	if (!acpi_has_method(device->handle, MEMORY_GET_BANDWIDTH))

		goto end;



	status = acpi_get_handle(device->handle, MEMORY_SET_BANDWIDTH, &dummy);

	if (ACPI_FAILURE(status))

	if (!acpi_has_method(device->handle, MEMORY_SET_BANDWIDTH))

		goto end;



	cdev = thermal_cooling_device_register("Memory controller", device,