diff options
Diffstat (limited to 'drivers/base/power/main.c')
-rw-r--r-- | drivers/base/power/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index bdc03f7e8424..ee9d1c8db0d6 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
@@ -415,7 +415,7 @@ EXPORT_SYMBOL_GPL(device_power_down); | |||
415 | * @dev: Device. | 415 | * @dev: Device. |
416 | * @state: Power state device is entering. | 416 | * @state: Power state device is entering. |
417 | */ | 417 | */ |
418 | int suspend_device(struct device *dev, pm_message_t state) | 418 | static int suspend_device(struct device *dev, pm_message_t state) |
419 | { | 419 | { |
420 | int error = 0; | 420 | int error = 0; |
421 | 421 | ||
@@ -479,7 +479,6 @@ static int dpm_suspend(pm_message_t state) | |||
479 | mutex_lock(&dpm_list_mtx); | 479 | mutex_lock(&dpm_list_mtx); |
480 | if (list_empty(&dev->power.entry)) | 480 | if (list_empty(&dev->power.entry)) |
481 | list_add(&dev->power.entry, &dpm_locked); | 481 | list_add(&dev->power.entry, &dpm_locked); |
482 | mutex_unlock(&dpm_list_mtx); | ||
483 | break; | 482 | break; |
484 | } | 483 | } |
485 | mutex_lock(&dpm_list_mtx); | 484 | mutex_lock(&dpm_list_mtx); |
@@ -523,6 +522,7 @@ static void lock_all_devices(void) | |||
523 | 522 | ||
524 | /** | 523 | /** |
525 | * device_suspend - Save state and stop all devices in system. | 524 | * device_suspend - Save state and stop all devices in system. |
525 | * @state: new power management state | ||
526 | * | 526 | * |
527 | * Prevent new devices from being registered, then lock all devices | 527 | * Prevent new devices from being registered, then lock all devices |
528 | * and suspend them. | 528 | * and suspend them. |