diff options
| -rw-r--r-- | drivers/base/power/main.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 6e7c3ccea24b..c81667d4bb60 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -1556,7 +1556,6 @@ int dpm_suspend(pm_message_t state) | |||
| 1556 | static int device_prepare(struct device *dev, pm_message_t state) | 1556 | static int device_prepare(struct device *dev, pm_message_t state) |
| 1557 | { | 1557 | { |
| 1558 | int (*callback)(struct device *) = NULL; | 1558 | int (*callback)(struct device *) = NULL; |
| 1559 | char *info = NULL; | ||
| 1560 | int ret = 0; | 1559 | int ret = 0; |
| 1561 | 1560 | ||
| 1562 | if (dev->power.syscore) | 1561 | if (dev->power.syscore) |
| @@ -1579,24 +1578,17 @@ static int device_prepare(struct device *dev, pm_message_t state) | |||
| 1579 | goto unlock; | 1578 | goto unlock; |
| 1580 | } | 1579 | } |
| 1581 | 1580 | ||
| 1582 | if (dev->pm_domain) { | 1581 | if (dev->pm_domain) |
| 1583 | info = "preparing power domain "; | ||
| 1584 | callback = dev->pm_domain->ops.prepare; | 1582 | callback = dev->pm_domain->ops.prepare; |
| 1585 | } else if (dev->type && dev->type->pm) { | 1583 | else if (dev->type && dev->type->pm) |
| 1586 | info = "preparing type "; | ||
| 1587 | callback = dev->type->pm->prepare; | 1584 | callback = dev->type->pm->prepare; |
| 1588 | } else if (dev->class && dev->class->pm) { | 1585 | else if (dev->class && dev->class->pm) |
| 1589 | info = "preparing class "; | ||
| 1590 | callback = dev->class->pm->prepare; | 1586 | callback = dev->class->pm->prepare; |
| 1591 | } else if (dev->bus && dev->bus->pm) { | 1587 | else if (dev->bus && dev->bus->pm) |
| 1592 | info = "preparing bus "; | ||
| 1593 | callback = dev->bus->pm->prepare; | 1588 | callback = dev->bus->pm->prepare; |
| 1594 | } | ||
| 1595 | 1589 | ||
| 1596 | if (!callback && dev->driver && dev->driver->pm) { | 1590 | if (!callback && dev->driver && dev->driver->pm) |
| 1597 | info = "preparing driver "; | ||
| 1598 | callback = dev->driver->pm->prepare; | 1591 | callback = dev->driver->pm->prepare; |
| 1599 | } | ||
| 1600 | 1592 | ||
| 1601 | if (callback) | 1593 | if (callback) |
| 1602 | ret = callback(dev); | 1594 | ret = callback(dev); |
