Commit 6148d38b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
  ...
parents d52fdf13 18468843

arch/x86/platform/olpc/olpc-xo15-sci.c

+4 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int xo15_sci_remove(struct acpi_device *device, int type) 
	return 0;

}



static int xo15_sci_resume(struct acpi_device *device)

static int xo15_sci_resume(struct device *dev)

{

	/* Enable all EC events */

	olpc_ec_mask_write(EC_SCI_SRC_ALL);
@@ -215,6 +215,8 @@ static int xo15_sci_resume(struct acpi_device *device) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume);



static const struct acpi_device_id xo15_sci_device_ids[] = {

	{"XO15EC", 0},

	{"", 0},
@@ -227,8 +229,8 @@ static struct acpi_driver xo15_sci_drv = { 
	.ops = {

		.add = xo15_sci_add,

		.remove = xo15_sci_remove,

		.resume = xo15_sci_resume,

	},

	.drv.pm = &xo15_sci_pm,

};



static int __init xo15_sci_init(void)

drivers/acpi/ac.c

+12 −5
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static int acpi_ac_open_fs(struct inode *inode, struct file *file); 


static int acpi_ac_add(struct acpi_device *device);

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

static int acpi_ac_resume(struct acpi_device *device);

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



static const struct acpi_device_id ac_device_ids[] = {
@@ -70,6 +69,9 @@ static const struct acpi_device_id ac_device_ids[] = { 
};

MODULE_DEVICE_TABLE(acpi, ac_device_ids);



static int acpi_ac_resume(struct device *dev);

static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);



static struct acpi_driver acpi_ac_driver = {

	.name = "ac",

	.class = ACPI_AC_CLASS,
@@ -78,9 +80,9 @@ static struct acpi_driver acpi_ac_driver = { 
	.ops = {

		.add = acpi_ac_add,

		.remove = acpi_ac_remove,

		.resume = acpi_ac_resume,

		.notify = acpi_ac_notify,

		},

	.drv.pm = &acpi_ac_pm,

};



struct acpi_ac {
@@ -309,13 +311,18 @@ static int acpi_ac_add(struct acpi_device *device) 
	return result;

}



static int acpi_ac_resume(struct acpi_device *device)

static int acpi_ac_resume(struct device *dev)

{

	struct acpi_ac *ac;

	unsigned old_state;

	if (!device || !acpi_driver_data(device))



	if (!dev)

		return -EINVAL;

	ac = acpi_driver_data(device);



	ac = acpi_driver_data(to_acpi_device(dev));

	if (!ac)

		return -EINVAL;



	old_state = ac->state;

	if (acpi_ac_get_state(ac))

		return 0;

drivers/acpi/battery.c

+11 −4
Original line number Diff line number Diff line
@@ -1044,17 +1044,24 @@ static int acpi_battery_remove(struct acpi_device *device, int type) 
}



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

static int acpi_battery_resume(struct acpi_device *device)

static int acpi_battery_resume(struct device *dev)

{

	struct acpi_battery *battery;

	if (!device)



	if (!dev)

		return -EINVAL;

	battery = acpi_driver_data(device);



	battery = acpi_driver_data(to_acpi_device(dev));

	if (!battery)

		return -EINVAL;



	battery->update_time = 0;

	acpi_battery_update(battery);

	return 0;

}



static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);



static struct acpi_driver acpi_battery_driver = {

	.name = "battery",

	.class = ACPI_BATTERY_CLASS,
@@ -1062,10 +1069,10 @@ static struct acpi_driver acpi_battery_driver = { 
	.flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,

	.ops = {

		.add = acpi_battery_add,

		.resume = acpi_battery_resume,

		.remove = acpi_battery_remove,

		.notify = acpi_battery_notify,

		},

	.drv.pm = &acpi_battery_pm,

};



static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)

drivers/acpi/button.c

+6 −3
Original line number Diff line number Diff line
@@ -76,19 +76,21 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids); 


static int acpi_button_add(struct acpi_device *device);

static int acpi_button_remove(struct acpi_device *device, int type);

static int acpi_button_resume(struct acpi_device *device);

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



static int acpi_button_resume(struct device *dev);

static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);



static struct acpi_driver acpi_button_driver = {

	.name = "button",

	.class = ACPI_BUTTON_CLASS,

	.ids = button_device_ids,

	.ops = {

		.add = acpi_button_add,

		.resume = acpi_button_resume,

		.remove = acpi_button_remove,

		.notify = acpi_button_notify,

	},

	.drv.pm = &acpi_button_pm,

};



struct acpi_button {
@@ -308,8 +310,9 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) 
	}

}



static int acpi_button_resume(struct acpi_device *device)

static int acpi_button_resume(struct device *dev)

{

	struct acpi_device *device = to_acpi_device(dev);

	struct acpi_button *button = acpi_driver_data(device);



	if (button->type == ACPI_BUTTON_TYPE_LID)

drivers/acpi/fan.c

+11 −10
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ MODULE_LICENSE("GPL"); 


static int acpi_fan_add(struct acpi_device *device);

static int acpi_fan_remove(struct acpi_device *device, int type);

static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state);

static int acpi_fan_resume(struct acpi_device *device);



static const struct acpi_device_id fan_device_ids[] = {

	{"PNP0C0B", 0},
@@ -55,6 +53,10 @@ static const struct acpi_device_id fan_device_ids[] = { 
};

MODULE_DEVICE_TABLE(acpi, fan_device_ids);



static int acpi_fan_suspend(struct device *dev);

static int acpi_fan_resume(struct device *dev);

static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume);



static struct acpi_driver acpi_fan_driver = {

	.name = "fan",

	.class = ACPI_FAN_CLASS,
@@ -62,9 +64,8 @@ static struct acpi_driver acpi_fan_driver = { 
	.ops = {

		.add = acpi_fan_add,

		.remove = acpi_fan_remove,

		.suspend = acpi_fan_suspend,

		.resume = acpi_fan_resume,

		},

	.drv.pm = &acpi_fan_pm,

};



/* thermal cooling device callbacks */
@@ -183,24 +184,24 @@ static int acpi_fan_remove(struct acpi_device *device, int type) 
	return 0;

}



static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)

static int acpi_fan_suspend(struct device *dev)

{

	if (!device)

	if (!dev)

		return -EINVAL;



	acpi_bus_set_power(device->handle, ACPI_STATE_D0);

	acpi_bus_set_power(to_acpi_device(dev)->handle, ACPI_STATE_D0);



	return AE_OK;

}



static int acpi_fan_resume(struct acpi_device *device)

static int acpi_fan_resume(struct device *dev)

{

	int result;



	if (!device)

	if (!dev)

		return -EINVAL;



	result = acpi_bus_update_power(device->handle, NULL);

	result = acpi_bus_update_power(to_acpi_device(dev)->handle, NULL);

	if (result)

		printk(KERN_ERR PREFIX "Error updating fan power state\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE