PCI: Remove pcim_iounmap_regions()

pcim_iounmap_regions() is deprecated. Moreover, it is not necessary to call it in the driver's remove() function or if probe() fails, since it does cleanup automatically on driver detach.

pcim_iounmap_regions() is deprecated. Moreover, it is not necessary to call it in the driver's remove() function or if probe() fails, since it does cleanup automatically on driver detach.

Remove all calls to pcim_iounmap_regions().

From: Philipp Stanner <[email protected]>

All users of the deprecated function pcim_iounmap_regions() have been ported by now. Remove it.

Signed-off-by Philipp Stanner <[email protected]>

---
 .../driver-api/driver-model/devres.rst        |  1 -
 drivers/pci/devres.c                          | 24 -------------------
 include/linux/pci.h                           |  1 -
 3 files changed, 26 deletions(-)

Documentation/driver-api/driver-model/devres.rst +0 -1

index d75728eb05f8..601f1a74d34d 100644
@@ -396,7 +396,6 @@ PCI
   pcim_iomap_regions()		: do request_region() and iomap() on multiple BARs
   pcim_iomap_table()		: array of mapped addresses indexed by BAR
   pcim_iounmap()		: do iounmap() on a single BAR
-  pcim_iounmap_regions()	: do iounmap() and release_region() on multiple BARs
   pcim_pin_device()		: keep PCI device enabled after release
   pcim_set_mwi()		: enable Memory-Write-Invalidate PCI transaction
 

drivers/pci/devres.c +0 -24

index 3431a7df3e0d..c60441555758 100644
@@ -946,30 +946,6 @@ int pcim_request_all_regions(struct pci_dev *pdev, const char *name)
 }
 EXPORT_SYMBOL(pcim_request_all_regions);
 
-/**
- * pcim_iounmap_regions - Unmap and release PCI BARs (DEPRECATED)
- * @pdev: PCI device to map IO resources for
- * @mask: Mask of BARs to unmap and release
- *
- * Unmap and release regions specified by @mask.
- *
- * This function is DEPRECATED. Do not use it in new code.
- * Use pcim_iounmap_region() instead.
- */
-void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
-{
-	int i;
-
-	for (i = 0; i < PCI_STD_NUM_BARS; i++) {
-		if (!mask_contains_bar(mask, i))
-			continue;
-
-		pcim_iounmap_region(pdev, i);
-		pcim_remove_bar_from_legacy_table(pdev, i);
-	}
-}
-EXPORT_SYMBOL(pcim_iounmap_regions);
-
 /**
  * pcim_iomap_range - Create a ranged __iomap mapping within a PCI BAR
  * @pdev: PCI device to map IO resources for

include/linux/pci.h +0 -0

index 47b31ad724fa..7661f10913ca 100644

The last remaining user of pcim_iounmap_regions() is mtip32 (in Linus's current master)

So we could finally remove this deprecated API. I suggest that this gets merged through the PCI tree.

(I also suggest we watch with an eagle's
eyes for folks who want to re-add calls to that function before the next merge window opens).

Quoted 7 lines · Philipp Stanner

The last remaining user of pcim_iounmap_regions() is mtip32 (in Linus's
current master)

So we could finally remove this deprecated API. I suggest that this gets
merged through the PCI tree.

Good god! One API less, +1 to support this move.

Reviewed-by Andy Shevchenko <[email protected]>

Quoted 4 lines

(I also suggest we watch with an eagle's
eyes for folks who want to re-add calls to that function before the next
merge window opens).

Instead of this I suggest that PCI can take this before merge window finishes
and cooks the (second) PR with it. In such a case we wouldn't need to care,
the developers will got broken builds.

Quoted 17 lines · Andy Shevchenko

Quoted 7 lines · Philipp Stanner

The last remaining user of pcim_iounmap_regions() is mtip32 (in Linus's
current master)

So we could finally remove this deprecated API. I suggest that this gets
merged through the PCI tree.

Good god! One API less, +1 to support this move.

Reviewed-by Andy Shevchenko <[email protected]>

Quoted 4 lines

(I also suggest we watch with an eagle's
eyes for folks who want to re-add calls to that function before the next
merge window opens).

Quoted 6 lines

Instead of this I suggest that PCI can take this before merge window finishes
and cooks the (second) PR with it. In such a case we wouldn't need to care,
the developers will got broken builds.

Normally Bjorn / PCI lets changes settle on a branch for >1 week before throwing them at mainline – but if we ask him very very nicely, maybe he would make an exception for this special case? :)

P.

The last remaining user of pcim_iounmap_regions() is mtip32 (in Linus's
current master)

So we could finally remove this deprecated API. I suggest that this gets
merged through the PCI tree. (I also suggest we watch with an eagle's eyes for folks who want to re-add calls to that function before the next
merge window opens).

P.

Philipp Stanner (2):
  mtip32xx: Remove unnecessary PCI function calls
  PCI: Remove pcim_iounmap_regions()

 .../driver-api/driver-model/devres.rst        |  1 - drivers/block/mtip32xx/mtip32xx.c             |  7 ++---- drivers/pci/devres.c                          | 24 ----------------- --
 include/linux/pci.h                           |  1 -

 4 files changed, 2 insertions(+), 31 deletions(-)

The last remaining user of pcim_iounmap_regions() is mtip32 (in Linus's current master)

So we could finally remove this deprecated API. I suggest that this gets merged through the PCI tree. (I also suggest we watch with an eagle's eyes for folks who want to re-add calls to that function before the next merge window opens).

P.

Philipp Stanner (2):
mtip32xx: Remove unnecessary PCI function calls
PCI: Remove pcim_iounmap_regions()

 .../driver-api/driver-model/devres.rst        |  1 -
 drivers/block/mtip32xx/mtip32xx.c             |  7 ++----
 drivers/pci/devres.c                          | 24 -------------------
 include/linux/pci.h                           |  1 -
 4 files changed, 2 insertions(+), 31 deletions(-)

Signature · 1 line

2.48.1