Skip to content

Commit 855c634

Browse files
Philipp Stannerbjorn-helgaas
authored andcommitted
PCI: Remove pcim_iounmap_regions()
All users of the deprecated function pcim_iounmap_regions() have been ported by now. Remove it. Signed-off-by: Philipp Stanner <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Zijun Hu <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent ebf7547 commit 855c634

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

Documentation/driver-api/driver-model/devres.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ PCI
396396
pcim_iomap_regions() : do request_region() and iomap() on multiple BARs
397397
pcim_iomap_table() : array of mapped addresses indexed by BAR
398398
pcim_iounmap() : do iounmap() on a single BAR
399-
pcim_iounmap_regions() : do iounmap() and release_region() on multiple BARs
400399
pcim_pin_device() : keep PCI device enabled after release
401400
pcim_set_mwi() : enable Memory-Write-Invalidate PCI transaction
402401

drivers/pci/devres.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -955,30 +955,6 @@ int pcim_request_all_regions(struct pci_dev *pdev, const char *name)
955955
}
956956
EXPORT_SYMBOL(pcim_request_all_regions);
957957

958-
/**
959-
* pcim_iounmap_regions - Unmap and release PCI BARs (DEPRECATED)
960-
* @pdev: PCI device to map IO resources for
961-
* @mask: Mask of BARs to unmap and release
962-
*
963-
* Unmap and release regions specified by @mask.
964-
*
965-
* This function is DEPRECATED. Do not use it in new code.
966-
* Use pcim_iounmap_region() instead.
967-
*/
968-
void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
969-
{
970-
int i;
971-
972-
for (i = 0; i < PCI_STD_NUM_BARS; i++) {
973-
if (!mask_contains_bar(mask, i))
974-
continue;
975-
976-
pcim_iounmap_region(pdev, i);
977-
pcim_remove_bar_from_legacy_table(pdev, i);
978-
}
979-
}
980-
EXPORT_SYMBOL(pcim_iounmap_regions);
981-
982958
/**
983959
* pcim_iomap_range - Create a ranged __iomap mapping within a PCI BAR
984960
* @pdev: PCI device to map IO resources for

include/linux/pci.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2322,7 +2322,6 @@ void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr);
23222322
void __iomem * const *pcim_iomap_table(struct pci_dev *pdev);
23232323
int pcim_request_region(struct pci_dev *pdev, int bar, const char *name);
23242324
int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name);
2325-
void pcim_iounmap_regions(struct pci_dev *pdev, int mask);
23262325
void __iomem *pcim_iomap_range(struct pci_dev *pdev, int bar,
23272326
unsigned long offset, unsigned long len);
23282327

0 commit comments

Comments
 (0)