Commit 7e7ba9b3 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

device property: Don't check for NULL twice in the loops 



In fwnode_get_next_available_child_node() we check next_child for NULL
twice. All the same in fwnode_get_next_parent_dev() we may avoid checking
fwnode for NULL twice.

Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210518064843.3524015-1-andy.shevchenko@gmail.com


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

drivers/base/property.c

+8 −8
Original line number Diff line number Diff line
@@ -627,14 +627,15 @@ EXPORT_SYMBOL_GPL(fwnode_get_next_parent); 
 */

struct device *fwnode_get_next_parent_dev(struct fwnode_handle *fwnode)

{

	struct device *dev = NULL;

	struct device *dev;



	fwnode_handle_get(fwnode);

	do {

		fwnode = fwnode_get_next_parent(fwnode);

		if (fwnode)

		if (!fwnode)

			return NULL;

		dev = get_dev_from_fwnode(fwnode);

	} while (fwnode && !dev);

	} while (!dev);

	fwnode_handle_put(fwnode);

	return dev;

}
@@ -742,10 +743,9 @@ fwnode_get_next_available_child_node(const struct fwnode_handle *fwnode, 


	do {

		next_child = fwnode_get_next_child_node(fwnode, next_child);



		if (!next_child || fwnode_device_is_available(next_child))

			break;

	} while (next_child);

		if (!next_child)

			return NULL;

	} while (!fwnode_device_is_available(next_child));



	return next_child;

}