misc: Use never-managed version of pci_intx()

pci_intx() is a hybrid function which can sometimes be managed through
devres. To remove this hybrid nature from pci_intx(), it is necessary to
port users to either an always-managed or a never-managed version.

cardreader/rtsx_pcr.c and tifm_7xx1.c enable their PCI devices with
pci_enable_device(). Thus, they need the never-managed version.

Replace pci_intx() with pci_intx_unmanaged().

Link: https://lore.kernel.org/r/20241209130632.132074-7-pstanner@redhat.com
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
index be3d4e0e50ccd60cae77f983776fccc8e2a566a3..e25e6d560dd7b2275b21f361741a091a69c32354 100644 (file)
--- a/drivers/misc/cardreader/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -1057,7 +1057,7 @@ static int rtsx_pci_acquire_irq(struct rtsx_pcr *pcr)
        }
 
        pcr->irq = pcr->pci->irq;
-       pci_intx(pcr->pci, !pcr->msi_en);
+       pci_intx_unmanaged(pcr->pci, !pcr->msi_en);
 
        return 0;
 }

diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index 1d54680d6ed20e0265ab5ffe93b7c3ce0378ba79..5f9c7ccae8d2e52f6642be338d30c8bec08ec5a1 100644 (file)
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -327,7 +327,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
                goto err_out;
        }
 
-       pci_intx(dev, 1);
+       pci_intx_unmanaged(dev, 1);
 
        fm = tifm_alloc_adapter(dev->device == PCI_DEVICE_ID_TI_XX21_XX11_FM
                                ? 4 : 2, &dev->dev);
@@ -368,7 +368,7 @@ err_out_unmap:
 err_out_free:
        tifm_free_adapter(fm);
 err_out_int:
-       pci_intx(dev, 0);
+       pci_intx_unmanaged(dev, 0);
        pci_release_regions(dev);
 err_out:
        if (!pci_dev_busy)
@@ -392,7 +392,7 @@ static void tifm_7xx1_remove(struct pci_dev *dev)
                tifm_7xx1_sock_power_off(tifm_7xx1_sock_addr(fm->addr, cnt));
 
        iounmap(fm->addr);
-       pci_intx(dev, 0);
+       pci_intx_unmanaged(dev, 0);
        pci_release_regions(dev);
 
        pci_disable_device(dev);