Commit 1e4cffe7 authored by Alexander Chiang's avatar Alexander Chiang Committed by Len Brown
Browse files

ACPI: video: convert to acpi_get_pci_dev

Now that acpi_get_pci_dev is available, let's use it instead of

Cc: Thomas Renninger <>
Signed-off-by: default avatarAlex Chiang <>
Acked-by: default avatarBjorn Helgaas <>
Signed-off-by: default avatarLen Brown <>
parent 80ffdedf
......@@ -1054,15 +1054,15 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
static int acpi_video_bus_check(struct acpi_video_bus *video)
acpi_status status = -ENOENT;
struct device *dev;
struct pci_dev *dev;
if (!video)
return -EINVAL;
dev = acpi_get_physical_pci_device(video->device->handle);
dev = acpi_get_pci_dev(video->device->handle);
if (!dev)
return -ENODEV;
/* Since there is no HID, CID and so on for VGA driver, we have
* to check well known required nodes.
......@@ -10,7 +10,7 @@
* assinged
* After PCI devices are glued with ACPI devices
* acpi_get_physical_pci_device() can be called to identify ACPI graphics
* acpi_get_pci_dev() can be called to identify ACPI graphics
* devices for which a real graphics card is plugged in
* Now acpi_video_get_capabilities() can be called to check which
......@@ -36,6 +36,7 @@
#include <linux/acpi.h>
#include <linux/dmi.h>
#include <linux/pci.h>
......@@ -109,7 +110,7 @@ static acpi_status
find_video(acpi_handle handle, u32 lvl, void *context, void **rv)
long *cap = context;
struct device *dev;
struct pci_dev *dev;
struct acpi_device *acpi_dev;
const struct acpi_device_id video_ids[] = {
......@@ -120,10 +121,10 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv)
return AE_OK;
if (!acpi_match_device_ids(acpi_dev, video_ids)) {
dev = acpi_get_physical_pci_device(handle);
dev = acpi_get_pci_dev(handle);
if (!dev)
return AE_OK;
*cap |= acpi_is_video_device(acpi_dev);
return AE_OK;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment