platform/x86: Use ACPI_FAILURE at appropriate places (3526ecad) · Commits · 戴 / test

drivers/platform/x86/intel-hid.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}