Skip to content

Commit 23812bb

Browse files
Philipp Stannerbroonie
authored andcommitted
spi: spi-cavium-thunderx: Use non-hybrid PCI devres API
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> Link: https://patch.msgid.link/20250417083902.23483-2-phasta@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 279b418 commit 23812bb

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

drivers/spi/spi-cavium-thunderx.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev,
3434
if (ret)
3535
goto error;
3636

37-
ret = pci_request_regions(pdev, DRV_NAME);
37+
ret = pcim_request_all_regions(pdev, DRV_NAME);
3838
if (ret)
3939
goto error;
4040

@@ -78,7 +78,6 @@ static int thunderx_spi_probe(struct pci_dev *pdev,
7878
return 0;
7979

8080
error:
81-
pci_release_regions(pdev);
8281
spi_controller_put(host);
8382
return ret;
8483
}
@@ -92,7 +91,6 @@ static void thunderx_spi_remove(struct pci_dev *pdev)
9291
if (!p)
9392
return;
9493

95-
pci_release_regions(pdev);
9694
/* Put everything in a known state. */
9795
writeq(0, p->register_base + OCTEON_SPI_CFG(p));
9896
}

0 commit comments

Comments
 (0)