Commit b0b8a945 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devprop-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull device properties framework fix from Rafael Wysocki:
 "Revert a problematic commit from the 5.3 development cycle (Brendan
  Higgins)"

* tag 'devprop-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "software node: Simplify software_node_release() function"
parents fe67d182 7589238a

drivers/base/swnode.c

+7 −7
Original line number Diff line number Diff line
@@ -608,6 +608,13 @@ static void software_node_release(struct kobject *kobj) 
{

	struct swnode *swnode = kobj_to_swnode(kobj);



	if (swnode->parent) {

		ida_simple_remove(&swnode->parent->child_ids, swnode->id);

		list_del(&swnode->entry);

	} else {

		ida_simple_remove(&swnode_root_ids, swnode->id);

	}



	if (swnode->allocated) {

		property_entries_free(swnode->node->properties);

		kfree(swnode->node);
@@ -773,13 +780,6 @@ void fwnode_remove_software_node(struct fwnode_handle *fwnode) 
	if (!swnode)

		return;



	if (swnode->parent) {

		ida_simple_remove(&swnode->parent->child_ids, swnode->id);

		list_del(&swnode->entry);

	} else {

		ida_simple_remove(&swnode_root_ids, swnode->id);

	}



	kobject_put(&swnode->kobj);

}

EXPORT_SYMBOL_GPL(fwnode_remove_software_node);