PCI: ibmphp: Fix double unmap of io_mem

ebda_rsrc_controller() calls iounmap(io_mem) on the error path. Its caller,
ibmphp_access_ebda(), also calls iounmap(io_mem) on good and error paths.

Remove the iounmap(io_mem) invocation from ebda_rsrc_controller().

[bhelgaas: remove item from TODO]
Link: https://lore.kernel.org/r/20210818165751.591185-1-os.vaslot@gmail.com
Signed-off-by: Vishal Aslot <os.vaslot@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/hotplug/TODO b/drivers/pci/hotplug/TODO
index a32070be5adf95921aa00b277b827ae881e8a2a1..cc6194aa24c1500922191a763524d6482c9491d3 100644 (file)
--- a/drivers/pci/hotplug/TODO
+++ b/drivers/pci/hotplug/TODO
@@ -40,9 +40,6 @@ ibmphp:
 
 * The return value of pci_hp_register() is not checked.
 
-* iounmap(io_mem) is called in the error path of ebda_rsrc_controller()
-  and once more in the error path of its caller ibmphp_access_ebda().
-
 * The various slot data structures are difficult to follow and need to be
   simplified.  A lot of functions are too large and too complex, they need
   to be broken up into smaller, manageable pieces.  Negative examples are

diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 11a2661dc06277319e0cd2ed873cd4b6408bdebc..7fb75401ad8a719ea7fd061cd075df579548b643 100644 (file)
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -714,8 +714,7 @@ static int __init ebda_rsrc_controller(void)
                /* init hpc structure */
                hpc_ptr = alloc_ebda_hpc(slot_num, bus_num);
                if (!hpc_ptr) {
-                       rc = -ENOMEM;
-                       goto error_no_hpc;
+                       return -ENOMEM;
                }
                hpc_ptr->ctlr_id = ctlr_id;
                hpc_ptr->ctlr_relative_id = ctlr;
@@ -910,8 +909,6 @@ error:
        kfree(tmp_slot);
 error_no_slot:
        free_ebda_hpc(hpc_ptr);
-error_no_hpc:
-       iounmap(io_mem);
        return rc;
 }