Skip to content

Commit c02c658

Browse files
Philipp Stannerstorulf
authored andcommitted
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(). Signed-off-by: Philipp Stanner <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent fe1c2ab commit c02c658

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/mmc/host/cavium-thunderx.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static int thunder_mmc_probe(struct pci_dev *pdev,
7272
if (ret)
7373
return ret;
7474

75-
ret = pci_request_regions(pdev, KBUILD_MODNAME);
75+
ret = pcim_request_all_regions(pdev, KBUILD_MODNAME);
7676
if (ret)
7777
return ret;
7878

@@ -164,7 +164,6 @@ static int thunder_mmc_probe(struct pci_dev *pdev,
164164
}
165165
}
166166
clk_disable_unprepare(host->clk);
167-
pci_release_regions(pdev);
168167
return ret;
169168
}
170169

@@ -183,7 +182,6 @@ static void thunder_mmc_remove(struct pci_dev *pdev)
183182
writeq(dma_cfg, host->dma_base + MIO_EMM_DMA_CFG(host));
184183

185184
clk_disable_unprepare(host->clk);
186-
pci_release_regions(pdev);
187185
}
188186

189187
static const struct pci_device_id thunder_mmc_id_table[] = {

0 commit comments

Comments
 (0)