Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 312753
b: refs/heads/master
c: d91ee32
h: refs/heads/master
i:
  312751: 73e3ecf
v: v3
  • Loading branch information
Rafael J. Wysocki committed Jul 1, 2012
1 parent d3f88d2 commit e9a7767
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 52 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5cd33e1d4f3319e86f9f0fc667fa74ef9d9216c
refs/heads/master: d91ee328c1e8b3992ffbf84a1a984c2a7f4ebff7
51 changes: 0 additions & 51 deletions trunk/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 e9a7767

Please sign in to comment.