From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 18 Jul 2012 22:03:35 +0000 (+0200)
Subject: Merge branch 'pm-acpi'
X-Git-Tag: v3.6-rc1~155^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6148d38b37ce9468cdf5a37ca49b4ac5c091e8fa;p=linux.git

Merge branch 'pm-acpi'

* pm-acpi: (24 commits)
  olpc-xo15-sci: Use struct dev_pm_ops for power management
  ACPI / PM: Drop PM callbacks from the ACPI bus type
  ACPI / PM: Drop legacy driver PM callbacks that are not used any more
  ACPI / PM: Do not execute legacy driver PM callbacks
  acpi_power_meter: Use struct dev_pm_ops for power management
  fujitsu-tablet: Use struct dev_pm_ops for power management
  classmate-laptop: Use struct dev_pm_ops for power management
  xo15-ebook: Use struct dev_pm_ops for power management
  toshiba_bluetooth: Use struct dev_pm_ops for power management
  panasonic-laptop: Use struct dev_pm_ops for power management
  sony-laptop: Use struct dev_pm_ops for power management
  hp_accel: Use struct dev_pm_ops for power management
  toshiba_acpi: Use struct dev_pm_ops for power management
  ACPI: Use struct dev_pm_ops for power management in the SBS driver
  ACPI: Use struct dev_pm_ops for power management in the power driver
  ACPI: Use struct dev_pm_ops for power management in the button driver
  ACPI: Use struct dev_pm_ops for power management in the battery driver
  ACPI: Use struct dev_pm_ops for power management in the AC driver
  ACPI: Use struct dev_pm_ops for power management in processor driver
  ACPI: Use struct dev_pm_ops for power management in the thermal driver
  ...
---

6148d38b37ce9468cdf5a37ca49b4ac5c091e8fa
diff --cc drivers/acpi/processor_idle.c
index 4cf964803d7a,6d9ec3e0b52e..e589c1985248
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@ -237,15 -241,23 +237,15 @@@ static void acpi_idle_bm_rld_restore(vo
  		acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld);
  }
  
- int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
+ int acpi_processor_suspend(struct device *dev)
  {
 -	if (acpi_idle_suspend == 1)
 -		return 0;
 -
  	acpi_idle_bm_rld_save();
 -	acpi_idle_suspend = 1;
  	return 0;
  }
  
- int acpi_processor_resume(struct acpi_device * device)
+ int acpi_processor_resume(struct device *dev)
  {
 -	if (acpi_idle_suspend == 0)
 -		return 0;
 -
  	acpi_idle_bm_rld_restore();
 -	acpi_idle_suspend = 0;
  	return 0;
  }