Commit 76f13081 authored by Saravana Kannan's avatar Saravana Kannan Committed by Greg Kroah-Hartman
Browse files

driver core: Create __fwnode_link_del() helper function 



The same code is repeated in multiple locations. Create a helper
function for it.

Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20210915172808.620546-3-saravanak@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68223eee

drivers/base/core.c

+19 −16
Original line number Diff line number Diff line
@@ -101,6 +101,19 @@ int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup) 
	return ret;

}



/**

 * __fwnode_link_del - Delete a link between two fwnode_handles.

 * @link: the fwnode_link to be deleted

 *

 * The fwnode_link_lock needs to be held when this function is called.

 */

static void __fwnode_link_del(struct fwnode_link *link)

{

	list_del(&link->s_hook);

	list_del(&link->c_hook);

	kfree(link);

}



/**

 * fwnode_links_purge_suppliers - Delete all supplier links of fwnode_handle.

 * @fwnode: fwnode whose supplier links need to be deleted
@@ -112,11 +125,8 @@ static void fwnode_links_purge_suppliers(struct fwnode_handle *fwnode) 
	struct fwnode_link *link, *tmp;



	mutex_lock(&fwnode_link_lock);

	list_for_each_entry_safe(link, tmp, &fwnode->suppliers, c_hook) {

		list_del(&link->s_hook);

		list_del(&link->c_hook);

		kfree(link);

	}

	list_for_each_entry_safe(link, tmp, &fwnode->suppliers, c_hook)

		__fwnode_link_del(link);

	mutex_unlock(&fwnode_link_lock);

}
@@ -131,11 +141,8 @@ static void fwnode_links_purge_consumers(struct fwnode_handle *fwnode) 
	struct fwnode_link *link, *tmp;



	mutex_lock(&fwnode_link_lock);

	list_for_each_entry_safe(link, tmp, &fwnode->consumers, s_hook) {

		list_del(&link->s_hook);

		list_del(&link->c_hook);

		kfree(link);

	}

	list_for_each_entry_safe(link, tmp, &fwnode->consumers, s_hook)

		__fwnode_link_del(link);

	mutex_unlock(&fwnode_link_lock);

}
@@ -1887,9 +1894,7 @@ static void __fw_devlink_link_to_consumers(struct device *dev) 
		if (!own_link || ret == -EAGAIN)

			continue;



		list_del(&link->s_hook);

		list_del(&link->c_hook);

		kfree(link);

		__fwnode_link_del(link);

	}

}
@@ -1941,9 +1946,7 @@ static void __fw_devlink_link_to_suppliers(struct device *dev, 
		if (!own_link || ret == -EAGAIN)

			continue;



		list_del(&link->s_hook);

		list_del(&link->c_hook);

		kfree(link);

		__fwnode_link_del(link);



		/* If no device link was created, nothing more to do. */

		if (ret)