Commit 10dabdf4 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

resource: Unify next_resource() and next_resource_skip_children() 



We have the next_resource() is used once and no user for the
next_resource_skip_children() outside of the for_each_resource().

Unify them by adding skip_children parameter to the next_resource().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230912165312.402422-2-andriy.shevchenko@linux.intel.com


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

kernel/resource.c

+6 −13
Original line number Diff line number Diff line
@@ -56,26 +56,17 @@ struct resource_constraint { 


static DEFINE_RWLOCK(resource_lock);



static struct resource *next_resource(struct resource *p)

static struct resource *next_resource(struct resource *p, bool skip_children)

{

	if (p->child)

	if (!skip_children && p->child)

		return p->child;

	while (!p->sibling && p->parent)

		p = p->parent;

	return p->sibling;

}



static struct resource *next_resource_skip_children(struct resource *p)

{

	while (!p->sibling && p->parent)

		p = p->parent;

	return p->sibling;

}



#define for_each_resource(_root, _p, _skip_children) \

	for ((_p) = (_root)->child; (_p); \

	     (_p) = (_skip_children) ? next_resource_skip_children(_p) : \

				       next_resource(_p))

	for ((_p) = (_root)->child; (_p); (_p) = next_resource(_p, _skip_children))



#ifdef CONFIG_PROC_FS
@@ -100,8 +91,10 @@ static void *r_start(struct seq_file *m, loff_t *pos) 
static void *r_next(struct seq_file *m, void *v, loff_t *pos)

{

	struct resource *p = v;



	(*pos)++;

	return (void *)next_resource(p);



	return (void *)next_resource(p, false);

}



static void r_stop(struct seq_file *m, void *v)