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

ACPI: fan: Fold two simple functions into their only caller 



Both acpi_fan_has_fst() and acpi_fan_is_acpi4() are called from one
place only, so fold them both into there caller which yields slightly
leaner code that is somewhat easier to follow.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3386797.aeNJFYEL58@rafael.j.wysocki
parent b320789d

drivers/acpi/fan_core.c

+4 −14
Original line number Diff line number Diff line
@@ -203,18 +203,6 @@ static const struct thermal_cooling_device_ops fan_cooling_ops = { 
 * --------------------------------------------------------------------------

*/



static bool acpi_fan_has_fst(struct acpi_device *device)

{

	return acpi_has_method(device->handle, "_FST");

}



static bool acpi_fan_is_acpi4(struct acpi_device *device)

{

	return acpi_has_method(device->handle, "_FIF") &&

	       acpi_has_method(device->handle, "_FPS") &&

	       acpi_has_method(device->handle, "_FSL");

}



static int acpi_fan_get_fif(struct acpi_device *device)

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -331,9 +319,11 @@ static int acpi_fan_probe(struct platform_device *pdev) 
	device->driver_data = fan;

	platform_set_drvdata(pdev, fan);



	if (acpi_fan_has_fst(device)) {

	if (acpi_has_method(device->handle, "_FST")) {

		fan->has_fst = true;

		fan->acpi4 = acpi_fan_is_acpi4(device);

		fan->acpi4 = acpi_has_method(device->handle, "_FIF") &&

				acpi_has_method(device->handle, "_FPS") &&

				acpi_has_method(device->handle, "_FSL");

	}



	if (fan->acpi4) {