ACPI: fan: Fold two simple functions into their only caller
Rafael J. Wysocki
maintainerPATCH 1/1 ACPI: fan: Fold two simple functions into their only caller
From: Rafael J. Wysocki <[email protected]>
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 Rafael J. Wysocki <[email protected]>
--- drivers/acpi/fan_core.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
drivers/acpi/fan_core.c +4 -14
@@ -203,18 +203,6 @@* -------------------------------------------------------------------------- */ -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 @@ 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) {