Skip to content

Commit

Permalink
ACPI: video: convert to acpi_get_pci_dev
Browse files Browse the repository at this point in the history
Now that acpi_get_pci_dev is available, let's use it instead of
acpi_get_physical_pci_device()

Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Alex Chiang <achiang@hp.com>
Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Alexander Chiang authored and Len Brown committed Jun 18, 2009
1 parent 80ffded commit 1e4cffe
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions drivers/acpi/video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
put_device(dev);
pci_dev_put(dev);

/* Since there is no HID, CID and so on for VGA driver, we have
* to check well known required nodes.
Expand Down
9 changes: 5 additions & 4 deletions drivers/acpi/video_detect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,6 +36,7 @@

#include <linux/acpi.h>
#include <linux/dmi.h>
#include <linux/pci.h>

ACPI_MODULE_NAME("video");
#define _COMPONENT ACPI_VIDEO_COMPONENT
Expand Down Expand Up @@ -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[] = {
Expand All @@ -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;
put_device(dev);
pci_dev_put(dev);
*cap |= acpi_is_video_device(acpi_dev);
}
return AE_OK;
Expand Down

0 comments on commit 1e4cffe

Please sign in to comment.