mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
platform/x86: Use ACPI_FAILURE at appropriate places
Use ACPI_FAILURE() to replace !ACPI_SUCCESS(), this avoid !! operations. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
parent
5dc444b804
commit
3526ecadc8
5 changed files with 7 additions and 7 deletions
|
@ -69,7 +69,7 @@ static int intel_hid_set_enable(struct device *device, int enable)
|
|||
|
||||
arg0.integer.value = enable;
|
||||
status = acpi_evaluate_object(ACPI_HANDLE(device), "HDSM", &args, NULL);
|
||||
if (!ACPI_SUCCESS(status)) {
|
||||
if (ACPI_FAILURE(status)) {
|
||||
dev_warn(device, "failed to %sable hotkeys\n",
|
||||
enable ? "en" : "dis");
|
||||
return -EIO;
|
||||
|
@ -148,7 +148,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
|
|||
}
|
||||
|
||||
status = acpi_evaluate_integer(handle, "HDEM", NULL, &ev_index);
|
||||
if (!ACPI_SUCCESS(status)) {
|
||||
if (ACPI_FAILURE(status)) {
|
||||
dev_warn(&device->dev, "failed to get event index\n");
|
||||
return;
|
||||
}
|
||||
|
@ -167,7 +167,7 @@ static int intel_hid_probe(struct platform_device *device)
|
|||
int err;
|
||||
|
||||
status = acpi_evaluate_integer(handle, "HDMM", NULL, &mode);
|
||||
if (!ACPI_SUCCESS(status)) {
|
||||
if (ACPI_FAILURE(status)) {
|
||||
dev_warn(&device->dev, "failed to read mode\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ static int smartconnect_acpi_init(struct acpi_device *acpi)
|
|||
acpi_status status;
|
||||
|
||||
status = acpi_evaluate_integer(acpi->handle, "GAOS", NULL, &value);
|
||||
if (!ACPI_SUCCESS(status))
|
||||
if (ACPI_FAILURE(status))
|
||||
return -EINVAL;
|
||||
|
||||
if (value & 0x1) {
|
||||
|
|
|
@ -97,7 +97,7 @@ static int intel_vbtn_probe(struct platform_device *device)
|
|||
int err;
|
||||
|
||||
status = acpi_evaluate_object(handle, "VBDL", NULL, NULL);
|
||||
if (!ACPI_SUCCESS(status)) {
|
||||
if (ACPI_FAILURE(status)) {
|
||||
dev_warn(&device->dev, "failed to read Intel Virtual Button driver\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
|
@ -458,7 +458,7 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
|
|||
|
||||
rc = acpi_evaluate_integer(pcc->handle, METHOD_HKEY_QUERY,
|
||||
NULL, &result);
|
||||
if (!ACPI_SUCCESS(rc)) {
|
||||
if (ACPI_FAILURE(rc)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"error getting hotkey status\n"));
|
||||
return;
|
||||
|
|
|
@ -9018,7 +9018,7 @@ static int mute_led_on_off(struct tp_led_table *t, bool state)
|
|||
acpi_handle temp;
|
||||
int output;
|
||||
|
||||
if (!ACPI_SUCCESS(acpi_get_handle(hkey_handle, t->name, &temp))) {
|
||||
if (ACPI_FAILURE(acpi_get_handle(hkey_handle, t->name, &temp))) {
|
||||
pr_warn("Thinkpad ACPI has no %s interface.\n", t->name);
|
||||
return -EIO;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue