Skip to content

Commit

Permalink
ACPI: video: add struct acpi_device to struct acpi_video_bus.
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Patrick Mochel authored and Len Brown committed Jun 30, 2006
1 parent 4159857 commit e6afa0d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/acpi/video.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ struct acpi_video_enumerated_device {

struct acpi_video_bus {
acpi_handle handle;
struct acpi_device *device;
u8 dos_setting;
struct acpi_video_enumerated_device *attached_array;
u8 attached_count;
Expand Down Expand Up @@ -1624,8 +1625,7 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
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,
Expand Down Expand Up @@ -1668,8 +1668,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
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) */
Expand Down Expand Up @@ -1708,6 +1707,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
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;
Expand Down

0 comments on commit e6afa0d

Please sign in to comment.