dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ACPI: video: convert to acpi_get_pci_dev 

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>
This commit is contained in:
Alexander Chiang 2009-06-10 19:56:00 +00:00 committed by Len Brown
parent 80ffdedf60
commit 1e4cffe78e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/video.c
View File

@ -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) static int acpi_video_bus_check(struct acpi_video_bus *video)
{ {
acpi_status status = -ENOENT; acpi_status status = -ENOENT;
struct device *dev; struct pci_dev *dev;
if (!video) if (!video)
return -EINVAL; return -EINVAL;
dev = acpi_get_physical_pci_device(video->device->handle); dev = acpi_get_pci_dev(video->device->handle);
if (!dev) if (!dev)
return -ENODEV; return -ENODEV;
put_device(dev); pci_dev_put(dev);
/* Since there is no HID, CID and so on for VGA driver, we have /* Since there is no HID, CID and so on for VGA driver, we have
* to check well known required nodes. * to check well known required nodes.

9
drivers/acpi/video_detect.c
View File

@ -10,7 +10,7 @@
* assinged * assinged
* *
* After PCI devices are glued with ACPI devices * 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 * devices for which a real graphics card is plugged in
* *
* Now acpi_video_get_capabilities() can be called to check which * Now acpi_video_get_capabilities() can be called to check which
@ -36,6 +36,7 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/pci.h>
ACPI_MODULE_NAME("video"); ACPI_MODULE_NAME("video");
#define _COMPONENT ACPI_VIDEO_COMPONENT #define _COMPONENT ACPI_VIDEO_COMPONENT
@ -109,7 +110,7 @@ static acpi_status
find_video(acpi_handle handle, u32 lvl, void *context, void **rv) find_video(acpi_handle handle, u32 lvl, void *context, void **rv)
{ {
long *cap = context; long *cap = context;
struct device *dev; struct pci_dev *dev;
struct acpi_device *acpi_dev; struct acpi_device *acpi_dev;
const struct acpi_device_id video_ids[] = { 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; return AE_OK;
if (!acpi_match_device_ids(acpi_dev, video_ids)) { if (!acpi_match_device_ids(acpi_dev, video_ids)) {
dev = acpi_get_physical_pci_device(handle); dev = acpi_get_pci_dev(handle);
if (!dev) if (!dev)
return AE_OK; return AE_OK;
put_device(dev); pci_dev_put(dev);
*cap |= acpi_is_video_device(acpi_dev); *cap |= acpi_is_video_device(acpi_dev);
} }
return AE_OK; return AE_OK;