Commit 803be832 authored by Barnabás Pőcze's avatar Barnabás Pőcze Committed by Hans de Goede

platform/x86: ideapad-laptop: use appropriately typed variable to store the...

platform/x86: ideapad-laptop: use appropriately typed variable to store the return value of ACPI methods

Use a variable with type `acpi_status` to store the return value of
ACPI methods instead of a plain `int`. And use ACPI_{SUCCESS,FAILURE}
macros where possible instead of direct comparison.
Signed-off-by: default avatarBarnabás Pőcze <pobrn@protonmail.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210203215403.290792-4-pobrn@protonmail.comSigned-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent e1a39a44
...@@ -1247,6 +1247,7 @@ static int ideapad_acpi_add(struct platform_device *pdev) ...@@ -1247,6 +1247,7 @@ static int ideapad_acpi_add(struct platform_device *pdev)
int cfg; int cfg;
struct ideapad_private *priv; struct ideapad_private *priv;
struct acpi_device *adev; struct acpi_device *adev;
acpi_status status;
ret = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev); ret = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev);
if (ret) if (ret)
...@@ -1303,22 +1304,27 @@ static int ideapad_acpi_add(struct platform_device *pdev) ...@@ -1303,22 +1304,27 @@ static int ideapad_acpi_add(struct platform_device *pdev)
if (ret && ret != -ENODEV) if (ret && ret != -ENODEV)
goto backlight_failed; goto backlight_failed;
} }
ret = acpi_install_notify_handler(adev->handle, status = acpi_install_notify_handler(adev->handle,
ACPI_DEVICE_NOTIFY, ideapad_acpi_notify, priv); ACPI_DEVICE_NOTIFY,
if (ret) ideapad_acpi_notify, priv);
if (ACPI_FAILURE(status)) {
ret = -EIO;
goto notification_failed; goto notification_failed;
}
#if IS_ENABLED(CONFIG_ACPI_WMI) #if IS_ENABLED(CONFIG_ACPI_WMI)
for (i = 0; i < ARRAY_SIZE(ideapad_wmi_fnesc_events); i++) { for (i = 0; i < ARRAY_SIZE(ideapad_wmi_fnesc_events); i++) {
ret = wmi_install_notify_handler(ideapad_wmi_fnesc_events[i], status = wmi_install_notify_handler(ideapad_wmi_fnesc_events[i],
ideapad_wmi_notify, priv); ideapad_wmi_notify, priv);
if (ret == AE_OK) { if (ACPI_SUCCESS(status)) {
priv->fnesc_guid = ideapad_wmi_fnesc_events[i]; priv->fnesc_guid = ideapad_wmi_fnesc_events[i];
break; break;
} }
} }
if (ret != AE_OK && ret != AE_NOT_EXIST) if (ACPI_FAILURE(status) && status != AE_NOT_EXIST) {
ret = -EIO;
goto notification_failed_wmi; goto notification_failed_wmi;
}
#endif #endif
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment