| Message ID | 20250417083902.23483-2-phasta@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 23812bbd7d5fe27b6b2e0fe5a8ba4c6f37f26671 |
| Headers | show |
| Series | [1/2] spi: spi-cavium-thunderx: Use non-hybrid PCI devres API | expand |
On Thu, 17 Apr 2025 10:39:02 +0200, Philipp Stanner wrote: > cavium-thunderx enables its PCI device with pcim_enable_device(). This, > implicitly, switches the function pci_request_regions() into managed > mode, where it becomes a devres function. > > The PCI subsystem wants to remove this hybrid nature from its > interfaces. To do so, users of the aforementioned combination of > functions must be ported to non-hybrid functions. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/2] spi: spi-cavium-thunderx: Use non-hybrid PCI devres API commit: 23812bbd7d5fe27b6b2e0fe5a8ba4c6f37f26671 [2/2] spi: pci1xxxx: Use non-hybrid PCI devres API commit: d981e7b3f25fbabca9cdd02aa2a8f16d6f235fc2 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-cavium-thunderx.c b/drivers/spi/spi-cavium-thunderx.c index 337aef12abcc..367ae7120bb3 100644 --- a/drivers/spi/spi-cavium-thunderx.c +++ b/drivers/spi/spi-cavium-thunderx.c @@ -34,7 +34,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev, if (ret) goto error; - ret = pci_request_regions(pdev, DRV_NAME); + ret = pcim_request_all_regions(pdev, DRV_NAME); if (ret) goto error; @@ -78,7 +78,6 @@ static int thunderx_spi_probe(struct pci_dev *pdev, return 0; error: - pci_release_regions(pdev); spi_controller_put(host); return ret; } @@ -92,7 +91,6 @@ static void thunderx_spi_remove(struct pci_dev *pdev) if (!p) return; - pci_release_regions(pdev); /* Put everything in a known state. */ writeq(0, p->register_base + OCTEON_SPI_CFG(p)); }
cavium-thunderx enables its PCI device with pcim_enable_device(). This, implicitly, switches the function pci_request_regions() into managed mode, where it becomes a devres function. The PCI subsystem wants to remove this hybrid nature from its interfaces. To do so, users of the aforementioned combination of functions must be ported to non-hybrid functions. Moreover, since both functions are already managed in this driver, the calls to pci_release_regions() are unnecessary. Remove the calls to pci_release_regions(). Replace the call to sometimes-managed pci_request_regions() with one to the always-managed pcim_request_all_regions(). Signed-off-by: Philipp Stanner <phasta@kernel.org> --- drivers/spi/spi-cavium-thunderx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)