misc: cardreader: Use non-hybrid PCI devres API

cardreader 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://lore.kernel.org/r/20250417091532.26520-2-phasta@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/cardreader/alcor_pci.c b/drivers/misc/cardreader/alcor_pci.c
index a5549eaf52d089c5c572bac1323b2ab650f24665..43f08b0db7427846aac0564ff7d514b351d8dff6 100644 (file)
--- a/drivers/misc/cardreader/alcor_pci.c
+++ b/drivers/misc/cardreader/alcor_pci.c
@@ -121,7 +121,7 @@ static int alcor_pci_probe(struct pci_dev *pdev,
        priv->cfg = cfg;
        priv->irq = pdev->irq;
 
-       ret = pci_request_regions(pdev, DRV_NAME_ALCOR_PCI);
+       ret = pcim_request_all_regions(pdev, DRV_NAME_ALCOR_PCI);
        if (ret) {
                dev_err(&pdev->dev, "Cannot request region\n");
                ret = -ENOMEM;
@@ -131,13 +131,13 @@ static int alcor_pci_probe(struct pci_dev *pdev,
        if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
                dev_err(&pdev->dev, "BAR %d is not iomem. Aborting.\n", bar);
                ret = -ENODEV;
-               goto error_release_regions;
+               goto error_free_ida;
        }
 
        priv->iobase = pcim_iomap(pdev, bar, 0);
        if (!priv->iobase) {
                ret = -ENOMEM;
-               goto error_release_regions;
+               goto error_free_ida;
        }
 
        /* make sure irqs are disabled */
@@ -147,7 +147,7 @@ static int alcor_pci_probe(struct pci_dev *pdev,
        ret = dma_set_mask_and_coherent(priv->dev, AU6601_SDMA_MASK);
        if (ret) {
                dev_err(priv->dev, "Failed to set DMA mask\n");
-               goto error_release_regions;
+               goto error_free_ida;
        }
 
        pci_set_master(pdev);
@@ -169,8 +169,6 @@ static int alcor_pci_probe(struct pci_dev *pdev,
 error_clear_drvdata:
        pci_clear_master(pdev);
        pci_set_drvdata(pdev, NULL);
-error_release_regions:
-       pci_release_regions(pdev);
 error_free_ida:
        ida_free(&alcor_pci_idr, priv->id);
        return ret;
@@ -186,7 +184,6 @@ static void alcor_pci_remove(struct pci_dev *pdev)
 
        ida_free(&alcor_pci_idr, priv->id);
 
-       pci_release_regions(pdev);
        pci_clear_master(pdev);
        pci_set_drvdata(pdev, NULL);
 }