* pm-sleep: PM / hibernate: fix typo "reserverd_size" -> "reserved_size" Documentation: power: Drop reference to interface.rst * pm-devfreq: Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"
Unified · Split
| @@ -13,7 +13,6 @@ Power Management · 12 unmodified lines | ||
| 13 | 13 | drivers-testing |
| 14 | 14 | energy-model |
| 15 | 15 | freezing-of-tasks |
| 16 | − interface | |
| 17 | 16 | opp |
| 18 | 17 | pci |
| 19 | 18 | pm_qos_interface |
| @@ -738,7 +738,6 @@ struct devfreq *devfreq_add_device(struct device *dev, · 737 unmodified lines | ||
| 738 | 738 | { |
| 739 | 739 | struct devfreq *devfreq; |
| 740 | 740 | struct devfreq_governor *governor; |
| 741 | − static atomic_t devfreq_no = ATOMIC_INIT(-1); | |
| 742 | 741 | int err = 0; |
| 743 | 742 | |
| 744 | 743 | if (!dev || !profile || !governor_name) { |
| @@ -800,8 +799,7 @@ struct devfreq *devfreq_add_device(struct device *dev, · 55 unmodified lines | ||
| 800 | 799 | devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev); |
| 801 | 800 | atomic_set(&devfreq->suspend_count, 0); |
| 802 | 801 | |
| 803 | − dev_set_name(&devfreq->dev, "devfreq%d", | |
| 804 | − atomic_inc_return(&devfreq_no)); | |
| 802 | + dev_set_name(&devfreq->dev, "%s", dev_name(dev)); | |
| 805 | 803 | err = device_register(&devfreq->dev); |
| 806 | 804 | if (err) { |
| 807 | 805 | mutex_unlock(&devfreq->lock); |
| @@ -1681,7 +1681,7 @@ static unsigned long minimum_image_size(unsigned long saveable) · 1680 unmodified lines | ||
| 1681 | 1681 | * hibernation for allocations made while saving the image and for device |
| 1682 | 1682 | * drivers, in case they need to allocate memory from their hibernation |
| 1683 | 1683 | * callbacks (these two numbers are given by PAGES_FOR_IO (which is a rough |
| 1684 | − * estimate) and reserverd_size divided by PAGE_SIZE (which is tunable through | |
| 1684 | + * estimate) and reserved_size divided by PAGE_SIZE (which is tunable through | |
| 1685 | 1685 | * /sys/power/reserved_size, respectively). To make this happen, we compute the |
| 1686 | 1686 | * total number of available page frames and allocate at least |
| 1687 | 1687 | * |