platform/surface: Switch to use acpi_evaluate_dsm_typed()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 18 Jan 2023 09:38:23 +0000 (11:38 +0200)
committerHans de Goede <hdegoede@redhat.com>
Thu, 2 Feb 2023 21:48:20 +0000 (22:48 +0100)
The acpi_evaluate_dsm_typed() provides a way to check the type of the
object evaluated by _DSM call. Use it instead of open coded variant.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com>
Link: https://lore.kernel.org/r/20230118093823.39679-1-andriy.shevchenko@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/platform/surface/surface_hotplug.c

index f004a24..7b6d887 100644 (file)
@@ -101,18 +101,12 @@ static void shps_dsm_notify_irq(struct platform_device *pdev, enum shps_irq_type
        param.type = ACPI_TYPE_INTEGER;
        param.integer.value = value;
 
-       result = acpi_evaluate_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION,
-                                  shps_dsm_fn_for_irq(type), &param);
-
+       result = acpi_evaluate_dsm_typed(handle, &shps_dsm_guid, SHPS_DSM_REVISION,
+                                        shps_dsm_fn_for_irq(type), &param, ACPI_TYPE_BUFFER);
        if (!result) {
                dev_err(&pdev->dev, "IRQ notification via DSM failed (irq=%d, gpio=%d)\n",
                        type, value);
 
-       } else if (result->type != ACPI_TYPE_BUFFER) {
-               dev_err(&pdev->dev,
-                       "IRQ notification via DSM failed: unexpected result type (irq=%d, gpio=%d)\n",
-                       type, value);
-
        } else if (result->buffer.length != 1 || result->buffer.pointer[0] != 0) {
                dev_err(&pdev->dev,
                        "IRQ notification via DSM failed: unexpected result value (irq=%d, gpio=%d)\n",
@@ -121,8 +115,7 @@ static void shps_dsm_notify_irq(struct platform_device *pdev, enum shps_irq_type
 
        mutex_unlock(&sdev->lock[type]);
 
-       if (result)
-               ACPI_FREE(result);
+       ACPI_FREE(result);
 }
 
 static irqreturn_t shps_handle_irq(int irq, void *data)