Merge branch 'acpi-cleanup'

Subsequent commits depend on the 'acpi-cleanup' material.

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/acpi/video.c
index 6dd237e79b4f977e2f8c2a934303fd5e46d13690,b862c7f7494197164387a614df9eb74562173515..f1fb2429dbb0013003141ff9943f80ac4f4bfd27
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -904,14 -881,10 +891,13 @@@ static void acpi_video_device_find_cap(
                device->cap._BCQ = 1;
        }
  
-       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
+       if (acpi_has_method(device->dev->handle, "_DDC"))
                device->cap._DDC = 1;
-       }
  
 -      if (acpi_video_backlight_support()) {
 +      if (acpi_video_init_brightness(device))
 +              return;
 +
 +      if (acpi_video_verify_backlight_support()) {
                struct backlight_properties props;
                struct pci_dev *pdev;
                acpi_handle acpi_parent;

diff --cc drivers/acpi/video_detect.c
Simple merge