From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-pci@vger.kernel.org, "Bjorn Helgaas" <bhelgaas@google.com>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Lukas Wunner" <lukas@wunner.de>,
"Mika Westerberg" <mika.westerberg@linux.intel.com>,
"Andy Shevchenko" <andriy.shevchenko@intel.com>,
"Rafael J . Wysocki" <rafael@kernel.org>,
linux-kernel@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 2/7] resource: Rename find_resource() to find_empty_resource_slot()
Date: Thu, 28 Dec 2023 18:57:02 +0200 [thread overview]
Message-ID: <20231228165707.3447-3-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20231228165707.3447-1-ilpo.jarvinen@linux.intel.com>
Rename find_resource() to find_empty_resource_slot() to better describe
what the functions does. This is a preparation for exposing it beyond
resource.c which is needed by PCI core. Also rename the __ variant to
match the names.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
kernel/resource.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/kernel/resource.c b/kernel/resource.c
index 866ef3663a0b..94f67005e1e2 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -574,10 +574,9 @@ static void resource_clip(struct resource *res, resource_size_t min,
* Find empty slot in the resource tree with the given range and
* alignment constraints
*/
-static int __find_resource(struct resource *root, struct resource *old,
- struct resource *new,
- resource_size_t size,
- struct resource_constraint *constraint)
+static int __find_empty_resource_slot(struct resource *root, struct resource *old,
+ struct resource *new, resource_size_t size,
+ struct resource_constraint *constraint)
{
struct resource *this = root->child;
struct resource tmp = *new, avail, alloc;
@@ -633,11 +632,11 @@ next: if (!this || this->end == root->end)
/*
* Find empty slot in the resource tree given range and alignment.
*/
-static int find_resource(struct resource *root, struct resource *new,
- resource_size_t size,
- struct resource_constraint *constraint)
+static int find_empty_resource_slot(struct resource *root, struct resource *new,
+ resource_size_t size,
+ struct resource_constraint *constraint)
{
- return __find_resource(root, NULL, new, size, constraint);
+ return __find_empty_resource_slot(root, NULL, new, size, constraint);
}
/**
@@ -660,7 +659,7 @@ static int reallocate_resource(struct resource *root, struct resource *old,
write_lock(&resource_lock);
- if ((err = __find_resource(root, old, &new, newsize, constraint)))
+ if ((err = __find_empty_resource_slot(root, old, &new, newsize, constraint)))
goto out;
if (resource_contains(&new, old)) {
@@ -729,7 +728,7 @@ int allocate_resource(struct resource *root, struct resource *new,
}
write_lock(&resource_lock);
- err = find_resource(root, new, size, &constraint);
+ err = find_empty_resource_slot(root, new, size, &constraint);
if (err >= 0 && __request_resource(root, new))
err = -EBUSY;
write_unlock(&resource_lock);
--
2.30.2
next prev parent reply other threads:[~2023-12-28 16:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-28 16:57 [PATCH v2 0/7] PCI: Solve two bridge window sizing issues Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 1/7] PCI: Fix resource double counting on remove & rescan Ilpo Järvinen
2023-12-28 16:57 ` Ilpo Järvinen [this message]
2024-05-03 20:49 ` [PATCH v2 2/7] resource: Rename find_resource() to find_empty_resource_slot() Bjorn Helgaas
2024-05-06 12:30 ` Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 3/7] resource: Document find_empty_resource_slot() and resource_constraint Ilpo Järvinen
2024-05-03 20:51 ` Bjorn Helgaas
2023-12-28 16:57 ` [PATCH v2 4/7] resource: Use typedef for alignf callback Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 5/7] resource: Handle simple alignment inside __find_empty_resource_slot() Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 6/7] resource: Export find_empty_resource_slot() Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 7/7] PCI: Relax bridge window tail sizing rules Ilpo Järvinen
2024-05-03 20:43 ` Bjorn Helgaas
2024-05-06 11:55 ` Ilpo Järvinen
2023-12-29 12:24 ` [PATCH v2 0/7] PCI: Solve two bridge window sizing issues Mika Westerberg
2024-01-04 12:12 ` Igor Mammedov
2024-01-04 12:18 ` Jonathan Woithe
2024-01-11 8:00 ` Jonathan Woithe
2024-01-18 6:48 ` Jonathan Woithe
2024-01-18 9:27 ` Ilpo Järvinen
2024-01-21 12:54 ` Andy Shevchenko
2024-01-21 22:20 ` Jonathan Woithe
2024-01-22 12:37 ` Ilpo Järvinen
2024-01-22 13:45 ` Igor Mammedov
2024-01-31 22:48 ` Jonathan Woithe
2024-02-01 14:47 ` Ilpo Järvinen
2024-03-15 10:33 ` Ilpo Järvinen
2024-03-15 14:39 ` Andy Shevchenko
2024-04-09 14:53 ` Jonathan Cameron
2024-04-11 10:41 ` Ilpo Järvinen
2024-04-11 11:16 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231228165707.3447-3-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=andriy.shevchenko@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=imammedo@redhat.com \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=lukas@wunner.de \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox