Commit e4e139be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-for-3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael J. Wysocki:

 - Fix for two recent regressions in the generic PM domains framework.

 - Revert of a commit that introduced a resume regression and is
   conceptually incorrect in my opinion.

 - Fix for a return value in pcc-cpufreq.c from Julia Lawall.

 - RTC wakeup signaling fix from Neil Brown.

 - Suppression of compiler warnings for CONFIG_PM_SLEEP unset in ACPI,
   platform/x86 and TPM drivers.

* tag 'pm-for-3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  tpm_tis / PM: Fix unused function warning for CONFIG_PM_SLEEP
  platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP
  ACPI / PM: Fix unused function warnings for CONFIG_PM_SLEEP
  Revert "NMI watchdog: fix for lockup detector breakage on resume"
  PM: Make dev_pm_get_subsys_data() always return 0 on success
  drivers/cpufreq/pcc-cpufreq.c: fix error return code
  RTC: Avoid races between RTC alarm wakeup and suspend.
parents 88de3d0d 07368d32

drivers/acpi/ac.c

+4 −0
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ static const struct acpi_device_id ac_device_ids[] = { 
};

MODULE_DEVICE_TABLE(acpi, ac_device_ids);



#ifdef CONFIG_PM_SLEEP

static int acpi_ac_resume(struct device *dev);

#endif

static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);



static struct acpi_driver acpi_ac_driver = {
@@ -313,6 +315,7 @@ static int acpi_ac_add(struct acpi_device *device) 
	return result;

}



#ifdef CONFIG_PM_SLEEP

static int acpi_ac_resume(struct device *dev)

{

	struct acpi_ac *ac;
@@ -332,6 +335,7 @@ static int acpi_ac_resume(struct device *dev) 
		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

	return 0;

}

#endif



static int acpi_ac_remove(struct acpi_device *device, int type)

{

drivers/acpi/battery.c

+2 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

/* this is needed to learn about changes made in suspended state */

static int acpi_battery_resume(struct device *dev)

{
@@ -1068,6 +1069,7 @@ static int acpi_battery_resume(struct device *dev) 
	acpi_battery_update(battery);

	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);

drivers/acpi/button.c

+4 −0
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ static int acpi_button_add(struct acpi_device *device); 
static int acpi_button_remove(struct acpi_device *device, int type);

static void acpi_button_notify(struct acpi_device *device, u32 event);



#ifdef CONFIG_PM_SLEEP

static int acpi_button_resume(struct device *dev);

#endif

static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);



static struct acpi_driver acpi_button_driver = {
@@ -310,6 +312,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) 
	}

}



#ifdef CONFIG_PM_SLEEP

static int acpi_button_resume(struct device *dev)

{

	struct acpi_device *device = to_acpi_device(dev);
@@ -319,6 +322,7 @@ static int acpi_button_resume(struct device *dev) 
		return acpi_lid_send_state(device);

	return 0;

}

#endif



static int acpi_button_add(struct acpi_device *device)

{

drivers/acpi/fan.c

+4 −0
Original line number Diff line number Diff line
@@ -53,8 +53,10 @@ static const struct acpi_device_id fan_device_ids[] = { 
};

MODULE_DEVICE_TABLE(acpi, fan_device_ids);



#ifdef CONFIG_PM_SLEEP

static int acpi_fan_suspend(struct device *dev);

static int acpi_fan_resume(struct device *dev);

#endif

static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume);



static struct acpi_driver acpi_fan_driver = {
@@ -184,6 +186,7 @@ static int acpi_fan_remove(struct acpi_device *device, int type) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int acpi_fan_suspend(struct device *dev)

{

	if (!dev)
@@ -207,6 +210,7 @@ static int acpi_fan_resume(struct device *dev) 


	return result;

}

#endif



static int __init acpi_fan_init(void)

{

drivers/acpi/power.c

+4 −0
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ static const struct acpi_device_id power_device_ids[] = { 
};

MODULE_DEVICE_TABLE(acpi, power_device_ids);



#ifdef CONFIG_PM_SLEEP

static int acpi_power_resume(struct device *dev);

#endif

static SIMPLE_DEV_PM_OPS(acpi_power_pm, NULL, acpi_power_resume);



static struct acpi_driver acpi_power_driver = {
@@ -775,6 +777,7 @@ static int acpi_power_remove(struct acpi_device *device, int type) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int acpi_power_resume(struct device *dev)

{

	int result = 0, state;
@@ -803,6 +806,7 @@ static int acpi_power_resume(struct device *dev) 


	return result;

}

#endif



int __init acpi_power_init(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE