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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3386797.aeNJFYEL58@rafael.j.wysocki

diff --git a/drivers/acpi/fan_core.c b/drivers/acpi/fan_core.c
index 095502086b41205ae4470a0e733384e64a6f0607..04ff608f2ff02cfc8a9cbfb2d5bbfa2a313f7b52 100644 (file)
--- a/drivers/acpi/fan_core.c
+++ b/drivers/acpi/fan_core.c
@@ -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) {