diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-09-12 19:53:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-05 13:58:07 +0200 |
| commit | 10dabdf45ed34caaaad97978306fe6e9ee7581d9 (patch) | |
| tree | 5a2e37c21f1ec903c49dde73a63001d604d6d0cf /kernel/resource.c | |
| parent | 441f0dd8fa035a2c7cfe972047bb905d3be05c1b (diff) | |
| download | linux-10dabdf45ed34caaaad97978306fe6e9ee7581d9.tar.gz linux-10dabdf45ed34caaaad97978306fe6e9ee7581d9.tar.bz2 linux-10dabdf45ed34caaaad97978306fe6e9ee7581d9.zip | |
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230912165312.402422-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 86716cd566e9..866ef3663a0b 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -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) |