Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more ACPI and power management updates from Rafael Wysocki:
 "These are regression fixes (leds-gpio, ACPI backlight driver,
  operating performance points library, ACPI device enumeration
  messages, cpupower tool), other bug fixes (ACPI EC driver, ACPI device
  PM), some cleanups in the operating performance points (OPP)
  framework, continuation of CONFIG_PM_RUNTIME elimination, a couple of
  minor intel_pstate driver changes, a new MAINTAINERS entry for it and
  an ACPI fan driver change needed for better support of thermal
  management in user space.

  Specifics:

   - Fix a regression in leds-gpio introduced by a recent commit that
     inadvertently changed the name of one of the properties used by the
     driver (Fabio Estevam).

   - Fix a regression in the ACPI backlight driver introduced by a
     recent fix that missed one special case that had to be taken into
     account (Aaron Lu).

   - Drop the level of some new kernel messages from the ACPI core
     introduced by a recent commit to KERN_DEBUG which they should have
     used from the start and drop some other unuseful KERN_ERR messages
     printed by ACPI (Rafael J Wysocki).

   - Revert an incorrect commit modifying the cpupower tool (Prarit
     Bhargava).

   - Fix two regressions introduced by recent commits in the OPP library
     and clean up some existing minor issues in that code (Viresh
     Kumar).

   - Continue to replace CONFIG_PM_RUNTIME with CONFIG_PM throughout the
     tree (or drop it where that can be done) in order to make it
     possible to eliminate CONFIG_PM_RUNTIME (Rafael J Wysocki, Ulf
     Hansson, Ludovic Desroches).

     There will be one more "CONFIG_PM_RUNTIME removal" batch after this
     one, because some new uses of it have been introduced during the
     current merge window, but that should be sufficient to finally get
     rid of it.

   - Make the ACPI EC driver more robust against race conditions related
     to GPE handler installation failures (Lv Zheng).

   - Prevent the ACPI device PM core code from attempting to disable
     GPEs that it has not enabled which confuses ACPICA and makes it
     report errors unnecessarily (Rafael J Wysocki).

   - Add a "force" command line switch to the intel_pstate driver to
     make it possible to override the blacklisting of some systems in
     that driver if needed (Ethan Zhao).

   - Improve intel_pstate code documentation and add a MAINTAINERS entry
     for it (Kristen Carlson Accardi).

   - Make the ACPI fan driver create cooling device interfaces witn
     names that reflect the IDs of the ACPI device objects they are
     associated with, except for "generic" ACPI fans (PNP ID "PNP0C0B").

     That's necessary for user space thermal management tools to be able
     to connect the fans with the parts of the system they are supposed
     to be cooling properly.  From Srinivas Pandruvada"

* tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
  MAINTAINERS: add entry for intel_pstate
  ACPI / video: update the skip case for acpi_video_device_in_dod()
  power / PM: Eliminate CONFIG_PM_RUNTIME
  NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  ACPI / EC: Fix unexpected ec_remove_handlers() invocations
  Revert "tools: cpupower: fix return checks for sysfs_get_idlestate_count()"
  tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
  PM: Remove the SET_PM_RUNTIME_PM_OPS() macro
  mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
  PM / Kconfig: Replace PM_RUNTIME with PM in dependencies
  ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  ACPI / PM: Do not disable wakeup GPEs that have not been enabled
  ACPI / utils: Drop error messages from acpi_evaluate_reference()
  ...

6 files changed, 30 insertions, 18 deletions

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 897640188acd..c2daa85fc9f7 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -680,13 +680,21 @@ static int acpi_device_wakeup(struct acpi_device *adev, u32 target_state,
                 if (error)
                         return error;
 
+                if (adev->wakeup.flags.enabled)
+                        return 0;
+
                 res = acpi_enable_gpe(wakeup->gpe_device, wakeup->gpe_number);
-                if (ACPI_FAILURE(res)) {
+                if (ACPI_SUCCESS(res)) {
+                        adev->wakeup.flags.enabled = 1;
+                } else {
                         acpi_disable_wakeup_device_power(adev);
                         return -EIO;
                 }
         } else {
-                acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);
+                if (adev->wakeup.flags.enabled) {
+                        acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);
+                        adev->wakeup.flags.enabled = 0;
+                }
                 acpi_disable_wakeup_device_power(adev);
         }
         return 0;
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5f9b74b9b71f..1b5853f384e2 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -844,6 +844,8 @@ static int ec_install_handlers(struct acpi_ec *ec)
 
 static void ec_remove_handlers(struct acpi_ec *ec)
 {
+        if (!test_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags))
+                return;
         acpi_disable_gpe(NULL, ec->gpe);
         if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
                                 ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index caf9b76b7ef8..7a36f02598a6 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -325,6 +325,7 @@ static int acpi_fan_probe(struct platform_device *pdev)
         struct thermal_cooling_device *cdev;
         struct acpi_fan *fan;
         struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
+        char *name;
 
         fan = devm_kzalloc(&pdev->dev, sizeof(*fan), GFP_KERNEL);
         if (!fan) {
@@ -346,7 +347,12 @@ static int acpi_fan_probe(struct platform_device *pdev)
                 }
         }
 
-        cdev = thermal_cooling_device_register("Fan", device,
+        if (!strncmp(pdev->name, "PNP0C0B", strlen("PNP0C0B")))
+                name = "Fan";
+        else
+                name = acpi_device_bid(device);
+
+        cdev = thermal_cooling_device_register(name, device,
                                                 &fan_cooling_ops);
         if (IS_ERR(cdev)) {
                 result = PTR_ERR(cdev);
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 1b1cf558d3d3..16914cc30882 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2214,7 +2214,7 @@ static void acpi_device_dep_initialize(struct acpi_device *adev)
         status = acpi_evaluate_reference(adev->handle, "_DEP", NULL,
                                         &dep_devices);
         if (ACPI_FAILURE(status)) {
-                dev_err(&adev->dev, "Failed to evaluate _DEP.\n");
+                dev_dbg(&adev->dev, "Failed to evaluate _DEP.\n");
                 return;
         }
 
@@ -2224,7 +2224,7 @@ static void acpi_device_dep_initialize(struct acpi_device *adev)
 
                 status = acpi_get_object_info(dep_devices.handles[i], &info);
                 if (ACPI_FAILURE(status)) {
-                        dev_err(&adev->dev, "Error reading device info\n");
+                        dev_dbg(&adev->dev, "Error reading _DEP device info\n");
                         continue;
                 }
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index dd8ff63ee2b4..cd49a3982b6a 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -346,22 +346,16 @@ acpi_evaluate_reference(acpi_handle handle,
         package = buffer.pointer;
 
         if ((buffer.length == 0) || !package) {
-                printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
-                            (unsigned)buffer.length, package);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
         }
         if (package->type != ACPI_TYPE_PACKAGE) {
-                printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
-                            package->type);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
         }
         if (!package->package.count) {
-                printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
-                            package);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
@@ -380,17 +374,13 @@ acpi_evaluate_reference(acpi_handle handle,
 
                 if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
                         status = AE_BAD_DATA;
-                        printk(KERN_ERR PREFIX
-                                    "Expecting a [Reference] package element, found type %X\n",
-                                    element->type);
                         acpi_util_eval_error(handle, pathname, status);
                         break;
                 }
 
                 if (!element->reference.handle) {
-                        printk(KERN_WARNING PREFIX "Invalid reference in"
-                               " package %s\n", pathname);
                         status = AE_NULL_ENTRY;
+                        acpi_util_eval_error(handle, pathname, status);
                         break;
                 }
                 /* Get the  acpi_handle. */
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 185a57d13723..1eaadff2e198 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -155,6 +155,7 @@ struct acpi_video_bus {
         u8 dos_setting;
         struct acpi_video_enumerated_device *attached_array;
         u8 attached_count;
+        u8 child_count;
         struct acpi_video_bus_cap cap;
         struct acpi_video_bus_flags flags;
         struct list_head video_device_list;
@@ -1159,8 +1160,12 @@ static bool acpi_video_device_in_dod(struct acpi_video_device *device)
         struct acpi_video_bus *video = device->video;
         int i;
 
-        /* If we have a broken _DOD, no need to test */
-        if (!video->attached_count)
+        /*
+         * If we have a broken _DOD or we have more than 8 output devices
+         * under the graphics controller node that we can't proper deal with
+         * in the operation region code currently, no need to test.
+         */
+        if (!video->attached_count || video->child_count > 8)
                 return true;
 
         for (i = 0; i < video->attached_count; i++) {
@@ -1413,6 +1418,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
                         dev_err(&dev->dev, "Can't attach device\n");
                         break;
                 }
+                video->child_count++;
         }
         return status;
 }