s390/pci: remove pdev during unplug

The disable slot implementation on s390 currently just detaches the
pci function from the partition - without informing the pci layer.
Fix this by calling pci_stop_and_remove_bus_device prior to the
operation.

Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index bd34359d1546cc0c0eb4625ab3a25e0c72470604..2e9539625d93b1a66257b7413bd3f8da738beb57 100644 (file)
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -236,7 +236,6 @@ int clp_disable_fh(struct zpci_dev *zdev)
        if (!zdev_enabled(zdev))
                return 0;
 
-       dev_info(&zdev->pdev->dev, "disabling fn handle: 0x%x\n", fh);
        rc = clp_set_pci_fn(&fh, 0, CLP_SET_DISABLE_PCI_FN);
        if (!rc)
                /* Success -> store disabled handle in zdev */

diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
index b12acaad9dc6d64bab07bd308dd41698e584fe18..ea3fa90d020a94548c8b1dd30ba8bccd606888b3 100644 (file)
--- a/drivers/pci/hotplug/s390_pci_hpc.c
+++ b/drivers/pci/hotplug/s390_pci_hpc.c
@@ -99,12 +99,13 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
        if (!zpci_fn_configured(slot->zdev->state))
                return -EIO;
 
+       if (slot->zdev->pdev)
+               pci_stop_and_remove_bus_device(slot->zdev->pdev);
+
        rc = zpci_disable_device(slot->zdev);
        if (rc)
                return rc;
-       /* TODO: we rely on the user to unbind/remove the device, is that plausible
-        *       or do we need to trigger that here?
-        */
+
        return slot_deconfigure(slot);
 }