Skip to content

Commit

Permalink
ACPI / PM: Drop PM callbacks from the ACPI bus type
Browse files Browse the repository at this point in the history
Since the ACPI bus type's PM callbacks only execute the driver ones
without doing anything else, they can be dropped, because the driver
callbacks will be executed by the PM core directly if bus type
(or other subsystem) callbacks are not present.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
  • Loading branch information
Rafael J. Wysocki committed Jul 1, 2012
1 parent a5cd33e commit d91ee32
Showing 1 changed file with 0 additions and 51 deletions.
51 changes: 0 additions & 51 deletions drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,56 +290,6 @@ static void acpi_device_release(struct device *dev)
kfree(acpi_dev);
}

#define ACPI_DEV_PM_CALLBACK(dev, callback) \
({ \
struct device_driver *__drv = dev->driver; \
int __ret = 0; \
\
if (__drv && __drv->pm && __drv->pm->callback) \
__ret = __drv->pm->callback(dev); \
\
__ret; \
})

static int acpi_pm_suspend(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, suspend);
}

static int acpi_pm_resume(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, resume);
}

static int acpi_pm_freeze(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, freeze);
}

static int acpi_pm_thaw(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, thaw);
}

static int acpi_pm_poweroff(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, poweroff);
}

static int acpi_pm_restore(struct device *dev)
{
return ACPI_DEV_PM_CALLBACK(dev, restore);
}

static const struct dev_pm_ops acpi_bus_pm = {
.suspend = acpi_pm_suspend,
.resume = acpi_pm_resume,
.freeze = acpi_pm_freeze,
.thaw = acpi_pm_thaw,
.poweroff = acpi_pm_poweroff,
.restore = acpi_pm_restore,
};

static int acpi_bus_match(struct device *dev, struct device_driver *drv)
{
struct acpi_device *acpi_dev = to_acpi_device(dev);
Expand Down Expand Up @@ -475,7 +425,6 @@ struct bus_type acpi_bus_type = {
.probe = acpi_device_probe,
.remove = acpi_device_remove,
.uevent = acpi_device_uevent,
.pm = &acpi_bus_pm,
};

static int acpi_device_register(struct acpi_device *device)
Expand Down

0 comments on commit d91ee32

Please sign in to comment.