diff options
author | Toshi Kani <toshi.kani@hp.com> | 2013-03-04 16:30:41 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-03-24 18:49:38 -0400 |
commit | d4e1a692e9e85f9cbee090ea8d6158b133d32157 (patch) | |
tree | d6b76ddfc967c7631f0c192af06fb3b7b70047c6 /drivers/gpu/drm | |
parent | b09753ec80914424527955147c359e9ac3a87682 (diff) |
ACPI: Remove acpi_device dependency in acpi_device_set_id()
This patch updates the internal operations of acpi_device_set_id()
to setup acpi_device_pnp without using acpi_device. There is no
functional change to acpi_device_set_id() in this patch.
acpi_pnp_type is added to acpi_device_pnp, so that PNPID type is
self-contained within acpi_device_pnp. acpi_add_id(), acpi_bay_match(),
acpi_dock_match(), acpi_ibm_smbus_match() and acpi_is_video_device()
are changed to take acpi_handle as an argument, instead of acpi_device.
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 4d338740f2cb..a8117e614009 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c | |||
@@ -350,11 +350,11 @@ static void intel_didl_outputs(struct drm_device *dev) | |||
350 | if (!handle || acpi_bus_get_device(handle, &acpi_dev)) | 350 | if (!handle || acpi_bus_get_device(handle, &acpi_dev)) |
351 | return; | 351 | return; |
352 | 352 | ||
353 | if (acpi_is_video_device(acpi_dev)) | 353 | if (acpi_is_video_device(handle)) |
354 | acpi_video_bus = acpi_dev; | 354 | acpi_video_bus = acpi_dev; |
355 | else { | 355 | else { |
356 | list_for_each_entry(acpi_cdev, &acpi_dev->children, node) { | 356 | list_for_each_entry(acpi_cdev, &acpi_dev->children, node) { |
357 | if (acpi_is_video_device(acpi_cdev)) { | 357 | if (acpi_is_video_device(acpi_cdev->handle)) { |
358 | acpi_video_bus = acpi_cdev; | 358 | acpi_video_bus = acpi_cdev; |
359 | break; | 359 | break; |
360 | } | 360 | } |