redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ACPI / PM: Do not execute legacy driver PM callbacks

Browse source 
Since all ACPI drivers in the tree should have been switched
to power management handling based on struct dev_pm_ops,
modify the ACPI bus type driver so that is doesn't execute
legacy driver power management callbacks from the functions
pointed to by the members of the acpi_bus_pm structure.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2012-06-29 23:40:13 +02:00
parent c5dec01822
commit 13db85528f
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/acpi/scan.c
View file

@ -290,51 +290,45 @@ static void acpi_device_release(struct device *dev)
kfree(acpi_dev);
}
#define ACPI_DEV_PM_CALLBACK(dev, callback, legacy_cb) \
#define ACPI_DEV_PM_CALLBACK(dev, callback) \
({ \
struct acpi_device *__acpi_dev = to_acpi_device(dev); \
struct acpi_driver *__acpi_drv = __acpi_dev->driver; \
struct device_driver *__drv = dev->driver; \
int __ret; \
int __ret = 0; \
\
if (__acpi_drv && __acpi_drv->ops.legacy_cb) \
__ret = __acpi_drv->ops.legacy_cb(__acpi_dev); \
else if (__drv && __drv->pm && __drv->pm->callback) \
if (__drv && __drv->pm && __drv->pm->callback) \
__ret = __drv->pm->callback(dev); \
else \
__ret = 0; \
\
__ret; \
})
static int acpi_pm_suspend(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, suspend, suspend);
return ACPI_DEV_PM_CALLBACK(dev, suspend);
}
static int acpi_pm_resume(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, resume, resume);
return ACPI_DEV_PM_CALLBACK(dev, resume);
}
static int acpi_pm_freeze(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, freeze, suspend);
return ACPI_DEV_PM_CALLBACK(dev, freeze);
}
static int acpi_pm_thaw(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, thaw, resume);
return ACPI_DEV_PM_CALLBACK(dev, thaw);
}
static int acpi_pm_poweroff(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, poweroff, suspend);
return ACPI_DEV_PM_CALLBACK(dev, poweroff);
}
static int acpi_pm_restore(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, restore, resume);
return ACPI_DEV_PM_CALLBACK(dev, restore);
}
static const struct dev_pm_ops acpi_bus_pm = {