libata: update libata LLDs to use devres

Update libata LLDs to use devres.  Core layer is already converted to
support managed LLDs.  This patch simplifies initialization and fixes
many resource related bugs in init failure and detach path.  For
example, all converted drivers now handle ata_device_add() failure
gracefully without excessive resource rollback code.

As most resources are released automatically on driver detach, many
drivers don't need or can do with much simpler ->{port|host}_stop().
In general, stop callbacks are need iff port or host needs to be given
commands to shut it down.  Note that freezing is enough in many cases
and ports are automatically frozen before being detached.

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

1 files changed, 10 insertions, 23 deletions

diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index af6f42578f59..7e51f1c0f7cb 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -126,8 +126,6 @@ static const struct ata_port_operations sis_ops = {
         .scr_read               = sis_scr_read,
         .scr_write              = sis_scr_write,
         .port_start             = ata_port_start,
-        .port_stop              = ata_port_stop,
-        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_info sis_port_info = {
@@ -260,29 +258,28 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         int rc;
         u32 genctl, val;
         struct ata_port_info pi = sis_port_info, *ppi[2] = { &pi, &pi };
-        int pci_dev_busy = 0;
         u8 pmr;
         u8 port2_start = 0x20;
 
         if (!printed_version++)
                 dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");
 
-        rc = pci_enable_device(pdev);
+        rc = pcim_enable_device(pdev);
         if (rc)
                 return rc;
 
         rc = pci_request_regions(pdev, DRV_NAME);
         if (rc) {
-                pci_dev_busy = 1;
-                goto err_out;
+                pcim_pin_device(pdev);
+                return rc;
         }
 
         rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
         if (rc)
-                goto err_out_regions;
+                return rc;
         rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK);
         if (rc)
-                goto err_out_regions;
+                return rc;
 
         /* check and see if the SCRs are in IO space or PCI cfg space */
         pci_read_config_dword(pdev, SIS_GENCTL, &genctl);
@@ -351,10 +348,8 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
-        if (!probe_ent) {
-                rc = -ENOMEM;
-                goto err_out_regions;
-        }
+        if (!probe_ent)
+                return -ENOMEM;
 
         if (!(probe_ent->port_flags & SIS_FLAG_CFGSCR)) {
                 probe_ent->port[0].scr_addr =
@@ -366,20 +361,12 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         pci_set_master(pdev);
         pci_intx(pdev, 1);
 
-        /* FIXME: check ata_device_add return value */
-        ata_device_add(probe_ent);
-        kfree(probe_ent);
+        if (!ata_device_add(probe_ent))
+                return -EIO;
 
+        devm_kfree(&pdev->dev, probe_ent);
         return 0;
 
-err_out_regions:
-        pci_release_regions(pdev);
-
-err_out:
-        if (!pci_dev_busy)
-                pci_disable_device(pdev);
-        return rc;
-
 }
 
 static int __init sis_init(void)