mmc: cavium-thunderx: Use non-hybrid PCI devres API
Subsystems (2)
PATCH 1/1 mmc: 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().
--- drivers/mmc/host/cavium-thunderx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/cavium-thunderx.c +1 -3
@@ -72,7 +72,7 @@ static int thunder_mmc_probe(struct pci_dev *pdev,if (ret)return ret; - ret =pci_request_regions (pdev,KBUILD_MODNAME ); + ret =pcim_request_all_regions (pdev,KBUILD_MODNAME );if (ret)return ret;
@@ -164,7 +164,6 @@ static int thunder_mmc_probe(struct pci_dev *pdev, } }clk_disable_unprepare (host->clk); -pci_release_regions (pdev);return ret; }
@@ -183,7 +182,6 @@ static void thunder_mmc_remove(struct pci_dev *pdev)writeq (dma_cfg, host->dma_base +MIO_EMM_DMA_CFG (host));clk_disable_unprepare (host->clk); -pci_release_regions (pdev); }static const struct pci_device_id thunder_mmc_id_table[] = {
Signature · 1 line
2.48.1
Quoted 12 lines · Philipp Stanner
cavium-thunderx enables its PCI device with
pcim_enable_device(). This, implicitly, switches the functionpci_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.
Quoted 6 lines
Remove the calls to
pci_release_regions().Replace the call to sometimes-managed
pci_request_regions()with one to the always-managedpcim_request_all_regions().Signed-off-by Philipp Stanner <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 36 lines
--- drivers/mmc/host/cavium-thunderx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/mmc/host/cavium-thunderx.c +1
-4@@ -72,7 +72,7 @@ static int thunder_mmc_probe(struct pci_dev *pdev,if (ret)return ret; - ret =pci_request_regions (pdev,KBUILD_MODNAME ); + ret =pcim_request_all_regions (pdev,KBUILD_MODNAME );if (ret)return ret;@@ -164,7 +164,6 @@ static int thunder_mmc_probe(struct pci_dev *pdev, } }clk_disable_unprepare (host->clk); -pci_release_regions (pdev);return ret; }@@ -183,7 +182,6 @@ static void thunder_mmc_remove(struct pci_dev *pdev)writeq (dma_cfg, host->dma_base +MIO_EMM_DMA_CFG (host));clk_disable_unprepare (host->clk); -pci_release_regions (pdev); }static const struct pci_device_id thunder_mmc_id_table[] = { --2.48.1