From: Philipp Stanner <phasta@kernel.org>
To: Jonathan Corbet <corbet@lwn.net>,
Bjorn Helgaas <bhelgaas@google.com>,
Philipp Stanner <phasta@kernel.org>,
Mark Brown <broonie@kernel.org>,
David Lechner <dlechner@baylibre.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Zijun Hu <quic_zijuhu@quicinc.com>,
Yang Yingliang <yangyingliang@huawei.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org
Subject: [PATCH 4/7] PCI: Remove request_flags relict from devres
Date: Thu, 15 May 2025 14:46:02 +0200 [thread overview]
Message-ID: <20250515124604.184313-6-phasta@kernel.org> (raw)
In-Reply-To: <20250515124604.184313-2-phasta@kernel.org>
pcim_request_region_exclusive(), the only user in PCI devres that needed
exclusive region requests, has been removed.
All features related to exclusive requests can, therefore, be removed,
too. Remove them.
Signed-off-by: Philipp Stanner <phasta@kernel.org>
---
drivers/pci/devres.c | 46 +++++++++++++++++++-------------------------
1 file changed, 20 insertions(+), 26 deletions(-)
diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c
index 769b92f4f66a..ae79e5f95c8a 100644
--- a/drivers/pci/devres.c
+++ b/drivers/pci/devres.c
@@ -808,31 +808,6 @@ int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name)
}
EXPORT_SYMBOL(pcim_iomap_regions);
-static int _pcim_request_region(struct pci_dev *pdev, int bar, const char *name,
- int request_flags)
-{
- int ret;
- struct pcim_addr_devres *res;
-
- if (!pci_bar_index_is_valid(bar))
- return -EINVAL;
-
- res = pcim_addr_devres_alloc(pdev);
- if (!res)
- return -ENOMEM;
- res->type = PCIM_ADDR_DEVRES_TYPE_REGION;
- res->bar = bar;
-
- ret = __pcim_request_region(pdev, bar, name, request_flags);
- if (ret != 0) {
- pcim_addr_devres_free(res);
- return ret;
- }
-
- devres_add(&pdev->dev, res);
- return 0;
-}
-
/**
* pcim_request_region - Request a PCI BAR
* @pdev: PCI device to request region for
@@ -848,7 +823,26 @@ static int _pcim_request_region(struct pci_dev *pdev, int bar, const char *name,
*/
int pcim_request_region(struct pci_dev *pdev, int bar, const char *name)
{
- return _pcim_request_region(pdev, bar, name, 0);
+ int ret;
+ struct pcim_addr_devres *res;
+
+ if (!pci_bar_index_is_valid(bar))
+ return -EINVAL;
+
+ res = pcim_addr_devres_alloc(pdev);
+ if (!res)
+ return -ENOMEM;
+ res->type = PCIM_ADDR_DEVRES_TYPE_REGION;
+ res->bar = bar;
+
+ ret = __pcim_request_region(pdev, bar, name, 0);
+ if (ret != 0) {
+ pcim_addr_devres_free(res);
+ return ret;
+ }
+
+ devres_add(&pdev->dev, res);
+ return 0;
}
EXPORT_SYMBOL(pcim_request_region);
--
2.49.0
next prev parent reply other threads:[~2025-05-15 12:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-15 12:45 [PATCH 0/7] PCI: Remove hybrid-devres region requests Philipp Stanner
2025-05-15 12:45 ` [PATCH 1/7] PCI: Remove hybrid devres nature from request functions Philipp Stanner
2025-05-15 12:46 ` [PATCH 2/7] Docu: PCI: Update pcim_enable_device() Philipp Stanner
2025-05-15 12:58 ` Andy Shevchenko
2025-05-16 7:49 ` Philipp Stanner
2025-05-16 13:28 ` Krzysztof Wilczyński
2025-05-16 13:41 ` Philipp Stanner
2025-05-16 13:48 ` Krzysztof Wilczyński
2025-05-17 16:32 ` Andy Shevchenko
2025-05-15 12:46 ` [PATCH 3/7] PCI: Remove pcim_request_region_exclusive() Philipp Stanner
2025-05-15 12:46 ` Philipp Stanner [this message]
2025-05-15 13:00 ` [PATCH 4/7] PCI: Remove request_flags relict from devres Andy Shevchenko
2025-05-16 7:48 ` Philipp Stanner
2025-05-15 12:46 ` [PATCH 5/7] PCI: Remove redundant set of request funcs Philipp Stanner
2025-05-15 12:46 ` [PATCH 6/7] PCI: Remove unnecessary prototype from pci.h Philipp Stanner
2025-05-15 13:02 ` Andy Shevchenko
2025-05-15 13:37 ` Philipp Stanner
2025-05-16 9:16 ` Andy Shevchenko
2025-05-15 12:46 ` [PATCH 7/7] PCI: Remove hybrid-devres hazzard warnings from doc Philipp Stanner
2025-05-15 13:08 ` [PATCH 0/7] PCI: Remove hybrid-devres region requests 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=20250515124604.184313-6-phasta@kernel.org \
--to=phasta@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=corbet@lwn.net \
--cc=dlechner@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=quic_zijuhu@quicinc.com \
--cc=yangyingliang@huawei.com \
/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;
as well as URLs for NNTP newsgroup(s).