summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-03-18 04:04:35 -0400
committerLen Brown <len.brown@intel.com>2008-03-18 04:04:35 -0400
commit77321e624b64f1e5985a20f3cd16b94c96d0dbb4 (patch)
treeb555227b42397b7e1536e805797876f0e3feeeec /drivers/acpi
parentf0d6752c9fa51d24c86b57c76ec5b2926a716b23 (diff)
downloadblackbird-op-linux-77321e624b64f1e5985a20f3cd16b94c96d0dbb4.tar.gz
blackbird-op-linux-77321e624b64f1e5985a20f3cd16b94c96d0dbb4.zip
Revert "ACPI: video: Ignore devices that aren't present in hardware"
This reverts commit 0119509c4fbc9adcef1472817fda295334612976. http://bugzilla.kernel.org/show_bug.cgi?id=9995 Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/video.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 98f1d4e55981..12fb44f16766 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1337,37 +1337,8 @@ acpi_video_bus_write_DOS(struct file *file,
static int acpi_video_bus_add_fs(struct acpi_device *device)
{
- long device_id;
- int status;
struct proc_dir_entry *entry = NULL;
struct acpi_video_bus *video;
- struct device *dev;
-
- status =
- acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
-
- if (!ACPI_SUCCESS(status))
- return -ENODEV;
-
- /* We need to attempt to determine whether the _ADR refers to a
- PCI device or not. There's no terribly good way to do this,
- so the best we can hope for is to assume that there'll never
- be a video device in the host bridge */
- if (device_id >= 0x10000) {
- /* It looks like a PCI device. Does it exist? */
- dev = acpi_get_physical_device(device->handle);
- } else {
- /* It doesn't look like a PCI device. Does its parent
- exist? */
- acpi_handle phandle;
- if (acpi_get_parent(device->handle, &phandle))
- return -ENODEV;
- dev = acpi_get_physical_device(phandle);
- }
- if (!dev)
- return -ENODEV;
- put_device(dev);
-
video = acpi_driver_data(device);
OpenPOWER on IntegriCloud