Commit 170bb4c8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  PM / Freezer: Fixup compile error of try_to_freeze_nowarn()
  driver core / PM: move the calling to device_pm_remove behind the calling to bus_remove_device
  PM / Hibernate: use rb_entry
  PM / sysfs: replace strict_str* with kstrto*
parents 64adb019 e5f57621

drivers/base/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,6 @@ void device_del(struct device *dev) 
	if (dev->bus)

		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,

					     BUS_NOTIFY_DEL_DEVICE, dev);

	device_pm_remove(dev);

	dpm_sysfs_remove(dev);

	if (parent)

		klist_del(&dev->p->knode_parent);
@@ -1205,6 +1204,7 @@ void device_del(struct device *dev) 
	device_remove_file(dev, &uevent_attr);

	device_remove_attrs(dev);

	bus_remove_device(dev);

	device_pm_remove(dev);

	driver_deferred_probe_del(dev);



	/* Notify the platform of the removal, in case they

include/linux/freezer.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static inline int freeze_kernel_threads(void) { return -ENOSYS; } 
static inline void thaw_processes(void) {}

static inline void thaw_kernel_threads(void) {}



static inline bool try_to_freeze_nowarn(void) { return false; }

static inline bool try_to_freeze(void) { return false; }



static inline void freezer_do_not_count(void) {}

kernel/power/main.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static ssize_t pm_async_store(struct kobject *kobj, struct kobj_attribute *attr, 
{

	unsigned long val;



	if (strict_strtoul(buf, 10, &val))

	if (kstrtoul(buf, 10, &val))

		return -EINVAL;



	if (val > 1)

kernel/power/qos.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, 
		} else {

			ascii_value[count] = '\0';

		}

		ret = strict_strtoul(ascii_value, 16, &ulval);

		ret = kstrtoul(ascii_value, 16, &ulval);

		if (ret) {

			pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);

			return -EINVAL;

kernel/power/swap.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int swsusp_extents_insert(unsigned long swap_offset) 


	/* Figure out where to put the new node */

	while (*new) {

		ext = container_of(*new, struct swsusp_extent, node);

		ext = rb_entry(*new, struct swsusp_extent, node);

		parent = *new;

		if (swap_offset < ext->start) {

			/* Try to merge */