libata: implement ata_host_detach()

Implement ata_host_detach() which calls ata_port_detach() for each
port in the host and export it.  ata_port_detach() is now internal and
thus un-exported.  ata_host_detach() will be used as the 'deregister
from libata layer' function after devres conversion.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 03b7a0051887cc8a668132ea2ba5c37d6561a9c6..649dfa57e51c01df3112579f91d86e5d6f26ea2e 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1792,8 +1792,7 @@ static void ahci_remove_one (struct pci_dev *pdev)
        unsigned int i;
        int have_msi;
 
-       for (i = 0; i < host->n_ports; i++)
-               ata_port_detach(host->ports[i]);
+       ata_host_detach(host);
 
        have_msi = hpriv->flags & AHCI_FLAG_MSI;
        free_irq(host->irq, host);

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 781d0959a228bde44e520dbd831ff912bd4557bc..a927c4c8bef31a755fe6a95d724105040c6aef3f 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5991,6 +5991,23 @@ void ata_port_detach(struct ata_port *ap)
        scsi_remove_host(ap->scsi_host);
 }
 
+/**
+ *     ata_host_detach - Detach all ports of an ATA host
+ *     @host: Host to detach
+ *
+ *     Detach all ports of @host.
+ *
+ *     LOCKING:
+ *     Kernel thread context (may sleep).
+ */
+void ata_host_detach(struct ata_host *host)
+{
+       int i;
+
+       for (i = 0; i < host->n_ports; i++)
+               ata_port_detach(host->ports[i]);
+}
+
 /**
  *     ata_host_remove - PCI layer callback for device removal
  *     @host: ATA host set that was removed
@@ -6006,8 +6023,7 @@ void ata_host_remove(struct ata_host *host)
 {
        unsigned int i;
 
-       for (i = 0; i < host->n_ports; i++)
-               ata_port_detach(host->ports[i]);
+       ata_host_detach(host);
 
        free_irq(host->irq, host);
        if (host->irq2)
@@ -6382,7 +6398,7 @@ EXPORT_SYMBOL_GPL(ata_std_bios_param);
 EXPORT_SYMBOL_GPL(ata_std_ports);
 EXPORT_SYMBOL_GPL(ata_host_init);
 EXPORT_SYMBOL_GPL(ata_device_add);
-EXPORT_SYMBOL_GPL(ata_port_detach);
+EXPORT_SYMBOL_GPL(ata_host_detach);
 EXPORT_SYMBOL_GPL(ata_host_remove);
 EXPORT_SYMBOL_GPL(ata_sg_init);
 EXPORT_SYMBOL_GPL(ata_sg_init_one);

diff --git a/include/linux/libata.h b/include/linux/libata.h
index a2458dfefb17d3a45fd6372b7d7344190ae1a2c2..e9a0cfdcfe2c529b7f2cfce7810af7375e3ea74c 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -719,7 +719,7 @@ extern int ata_pci_device_resume(struct pci_dev *pdev);
 extern int ata_pci_clear_simplex(struct pci_dev *pdev);
 #endif /* CONFIG_PCI */
 extern int ata_device_add(const struct ata_probe_ent *ent);
-extern void ata_port_detach(struct ata_port *ap);
+extern void ata_host_detach(struct ata_host *host);
 extern void ata_host_init(struct ata_host *, struct device *,
                          unsigned long, const struct ata_port_operations *);
 extern void ata_host_remove(struct ata_host *host);