Skip to content

Commit

Permalink
platform/x86: Use ACPI_FAILURE at appropriate places
Browse files Browse the repository at this point in the history
Use ACPI_FAILURE() to replace !ACPI_SUCCESS(), this avoid !! operations.

Signed-off-by: Axel Lin <[email protected]>
Acked-by: Henrique de Moraes Holschuh <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: Andy Shevchenko <[email protected]>
  • Loading branch information
AxelLin authored and dvhart committed Dec 13, 2016
1 parent 5dc444b commit 3526eca
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions drivers/platform/x86/intel-hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/intel-smartconnect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/intel-vbtn.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/panasonic-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/thinkpad_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 3526eca

Please sign in to comment.