commit e6afa0de1476290a876dfd1237a97cce7735581c
author Patrick Mochel <mochel@linux.intel.com> Fri May 19 16:54:40 2006 -0400
committer Len Brown <len.brown@intel.com> Fri Jun 30 02:32:25 2006 -0400
tree 6abb3a9a4e079627aa0c38e9eddbe470dbf96a9a
parent 415985728895ba3127116bc4f999caf94420ed85

ACPI: video: add struct acpi_device to struct acpi_video_bus.

- Use it instead of acpi_bus_get_device() in acpi_video_bus_notify()
  and use the one from struct acpi_video_device in
  acpi_video_device_notify().

Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/video.c

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 9feb633..cee9a50 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -118,6 +118,7 @@
 
 struct acpi_video_bus {
 	acpi_handle handle;
+	struct acpi_device *device;
 	u8 dos_setting;
 	struct acpi_video_enumerated_device *attached_array;
 	u8 attached_count;
@@ -1624,8 +1625,7 @@
 	if (!video)
 		return;
 
-	if (acpi_bus_get_device(handle, &device))
-		return;
+	device = video->device;
 
 	switch (event) {
 	case ACPI_VIDEO_NOTIFY_SWITCH:	/* User request that a switch occur,
@@ -1668,8 +1668,7 @@
 	if (!video_device)
 		return;
 
-	if (acpi_bus_get_device(handle, &device))
-		return;
+	device = video_device->dev;
 
 	switch (event) {
 	case ACPI_VIDEO_NOTIFY_SWITCH:	/* change in status (cycle output device) */
@@ -1708,6 +1707,7 @@
 	memset(video, 0, sizeof(struct acpi_video_bus));
 
 	video->handle = device->handle;
+	video->device = device;
 	strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
 	strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
 	acpi_driver_data(device) = video;