PNPACPI: save struct acpi_device, not just acpi_handle
Some drivers need to look at things in the acpi_device structure besides the handle. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
22763c5cf3
commit
c4da6940a7
|
@ -80,7 +80,8 @@ static int pnpacpi_get_resources(struct pnp_dev *dev)
|
|||
|
||||
static int pnpacpi_set_resources(struct pnp_dev *dev)
|
||||
{
|
||||
acpi_handle handle = dev->data;
|
||||
struct acpi_device *acpi_dev = dev->data;
|
||||
acpi_handle handle = acpi_dev->handle;
|
||||
struct acpi_buffer buffer;
|
||||
int ret;
|
||||
|
||||
|
@ -103,7 +104,8 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
|
|||
|
||||
static int pnpacpi_disable_resources(struct pnp_dev *dev)
|
||||
{
|
||||
acpi_handle handle = dev->data;
|
||||
struct acpi_device *acpi_dev = dev->data;
|
||||
acpi_handle handle = acpi_dev->handle;
|
||||
int ret;
|
||||
|
||||
dev_dbg(&dev->dev, "disable resources\n");
|
||||
|
@ -121,6 +123,8 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
|
|||
#ifdef CONFIG_ACPI_SLEEP
|
||||
static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
|
||||
{
|
||||
struct acpi_device *acpi_dev = dev->data;
|
||||
acpi_handle handle = acpi_dev->handle;
|
||||
int power_state;
|
||||
|
||||
power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
|
||||
|
@ -128,12 +132,15 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
|
|||
power_state = (state.event == PM_EVENT_ON) ?
|
||||
ACPI_STATE_D0 : ACPI_STATE_D3;
|
||||
|
||||
return acpi_bus_set_power((acpi_handle) dev->data, power_state);
|
||||
return acpi_bus_set_power(handle, power_state);
|
||||
}
|
||||
|
||||
static int pnpacpi_resume(struct pnp_dev *dev)
|
||||
{
|
||||
return acpi_bus_set_power((acpi_handle) dev->data, ACPI_STATE_D0);
|
||||
struct acpi_device *acpi_dev = dev->data;
|
||||
acpi_handle handle = acpi_dev->handle;
|
||||
|
||||
return acpi_bus_set_power(handle, ACPI_STATE_D0);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -168,7 +175,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
|
|||
if (!dev)
|
||||
return -ENOMEM;
|
||||
|
||||
dev->data = device->handle;
|
||||
dev->data = device;
|
||||
/* .enabled means the device can decode the resources */
|
||||
dev->active = device->status.enabled;
|
||||
status = acpi_get_handle(device->handle, "_SRS", &temp);
|
||||
|
|
|
@ -465,7 +465,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
|
|||
|
||||
int pnpacpi_parse_allocated_resource(struct pnp_dev *dev)
|
||||
{
|
||||
acpi_handle handle = dev->data;
|
||||
struct acpi_device *acpi_dev = dev->data;
|
||||
acpi_handle handle = acpi_dev->handle;
|
||||
acpi_status status;
|
||||
|
||||
pnp_dbg(&dev->dev, "parse allocated resources\n");
|
||||
|
@ -773,7 +774,8 @@ static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
|
|||
|
||||
int __init pnpacpi_parse_resource_option_data(struct pnp_dev *dev)
|
||||
{
|
||||
acpi_handle handle = dev->data;
|
||||
struct acpi_device *acpi_dev = dev->data;
|
||||
acpi_handle handle = acpi_dev->handle;
|
||||
acpi_status status;
|
||||
struct acpipnp_parse_option_s parse_data;
|
||||
|
||||
|
@ -845,7 +847,8 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
|
|||
int pnpacpi_build_resource_template(struct pnp_dev *dev,
|
||||
struct acpi_buffer *buffer)
|
||||
{
|
||||
acpi_handle handle = dev->data;
|
||||
struct acpi_device *acpi_dev = dev->data;
|
||||
acpi_handle handle = acpi_dev->handle;
|
||||
struct acpi_resource *resource;
|
||||
int res_cnt = 0;
|
||||
acpi_status status;
|
||||
|
|
Loading…
Reference in a new issue