diff options
| author | Thierry Reding <treding@nvidia.com> | 2016-04-28 14:42:34 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-28 15:13:01 +0200 |
| commit | fba1fbf56383073d286e6e3657bff36ee0f410e8 (patch) | |
| tree | 38f26522bacb9fa45a713c30d0b47cec94585182 /drivers/base | |
| parent | 372a12ed9d99c02f105278a9b75f0cb176d15cc1 (diff) | |
| download | op-kernel-dev-fba1fbf56383073d286e6e3657bff36ee0f410e8.zip op-kernel-dev-fba1fbf56383073d286e6e3657bff36ee0f410e8.tar.gz | |
PM / sleep: Drop unused `info' variable
Commit 32e8d689dc12 (PM / sleep: trace_device_pm_callback coverage in
dpm_prepare/complete) removed all users of this variable but forgot to
remove the variable itself.
Signed-off-by: Thierry Reding <treding@nvidia.com>
[ rjw: Subject ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base')
| -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 6e7c3cc..c81667d 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1556,7 +1556,6 @@ int dpm_suspend(pm_message_t state) static int device_prepare(struct device *dev, pm_message_t state) { int (*callback)(struct device *) = NULL; - char *info = NULL; int ret = 0; if (dev->power.syscore) @@ -1579,24 +1578,17 @@ static int device_prepare(struct device *dev, pm_message_t state) goto unlock; } - if (dev->pm_domain) { - info = "preparing power domain "; + if (dev->pm_domain) callback = dev->pm_domain->ops.prepare; - } else if (dev->type && dev->type->pm) { - info = "preparing type "; + else if (dev->type && dev->type->pm) callback = dev->type->pm->prepare; - } else if (dev->class && dev->class->pm) { - info = "preparing class "; + else if (dev->class && dev->class->pm) callback = dev->class->pm->prepare; - } else if (dev->bus && dev->bus->pm) { - info = "preparing bus "; + else if (dev->bus && dev->bus->pm) callback = dev->bus->pm->prepare; - } - if (!callback && dev->driver && dev->driver->pm) { - info = "preparing driver "; + if (!callback && dev->driver && dev->driver->pm) callback = dev->driver->pm->prepare; - } if (callback) ret = callback(dev); |
