浏览代码

i915: intel_acpi: convert acpi_get_handle() to acpi_has_method()

acpi_has_method() is a new ACPI API introduced to check
the existence of an ACPI control method.

It can be used to replace acpi_get_handle() in the case that
1. the calling function doesn't need the ACPI handle of the control method.
and
2. the calling function doesn't care the reason why the method is unavailable.

Convert acpi_get_handle() to acpi_has_method()
in drivers/gpu/drm/i915/intel_acpi.c in this patch.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Zhang Rui 12 年之前
父节点
当前提交
2a3ca14295
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      drivers/gpu/drm/i915/intel_acpi.c

+ 2 - 4
drivers/gpu/drm/i915/intel_acpi.c

@@ -193,16 +193,14 @@ out:
 
 
 static bool intel_dsm_pci_probe(struct pci_dev *pdev)
 static bool intel_dsm_pci_probe(struct pci_dev *pdev)
 {
 {
-	acpi_handle dhandle, intel_handle;
-	acpi_status status;
+	acpi_handle dhandle;
 	int ret;
 	int ret;
 
 
 	dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
 	dhandle = DEVICE_ACPI_HANDLE(&pdev->dev);
 	if (!dhandle)
 	if (!dhandle)
 		return false;
 		return false;
 
 
-	status = acpi_get_handle(dhandle, "_DSM", &intel_handle);
-	if (ACPI_FAILURE(status)) {
+	if (!acpi_has_method(dhandle, "_DSM")) {
 		DRM_DEBUG_KMS("no _DSM method for intel device\n");
 		DRM_DEBUG_KMS("no _DSM method for intel device\n");
 		return false;
 		return false;
 	}
 	}