devres: release resources on device_del()

[~andy/linux] / drivers / ata / sata_inic162x.c

diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index c98e0227a60c32ddd087a035288e91bb82070afa..3193a603d1a159cb99b59e9f7bb705f765d28bda 100644 (file)
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -135,8 +135,10 @@ static struct scsi_host_template inic_sht = {
        .slave_configure        = inic_slave_config,
        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
+#ifdef CONFIG_PM
        .suspend                = ata_scsi_device_suspend,
        .resume                 = ata_scsi_device_resume,
+#endif
 };
 
 static const int scr_map[] = {
@@ -147,7 +149,7 @@ static const int scr_map[] = {
 
 static void __iomem * inic_port_base(struct ata_port *ap)
 {
-       return ap->host->mmio_base + ap->port_no * PORT_SIZE;
+       return ap->host->iomap[MMIO_BAR] + ap->port_no * PORT_SIZE;
 }
 
 static void __inic_set_pirq_mask(struct ata_port *ap, u8 mask)
@@ -324,7 +326,7 @@ static void inic_host_intr(struct ata_port *ap)
 static irqreturn_t inic_interrupt(int irq, void *dev_instance)
 {
        struct ata_host *host = dev_instance;
-       void __iomem *mmio_base = host->mmio_base;
+       void __iomem *mmio_base = host->iomap[MMIO_BAR];
        u16 host_irq_stat;
        int i, handled = 0;;
 
@@ -429,11 +431,6 @@ static int inic_hardreset(struct ata_port *ap, unsigned int *class)
        /* hammer it into sane state */
        inic_reset_port(port_base);
 
-       if (ata_port_offline(ap)) {
-               *class = ATA_DEV_NONE;
-               return 0;
-       }
-
        val = readw(idma_ctl);
        writew(val | IDMA_CTL_RST_ATA, idma_ctl);
        readw(idma_ctl);        /* flush */
@@ -443,16 +440,17 @@ static int inic_hardreset(struct ata_port *ap, unsigned int *class)
        rc = sata_phy_resume(ap, timing);
        if (rc) {
                ata_port_printk(ap, KERN_WARNING, "failed to resume "
-                               "link for reset (errno=%d)\n", rc);
+                               "link after reset (errno=%d)\n", rc);
                return rc;
        }
 
-       msleep(150);
-
        *class = ATA_DEV_NONE;
        if (ata_port_online(ap)) {
                struct ata_taskfile tf;
 
+               /* wait a while before checking status */
+               msleep(150);
+
                if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
                        ata_port_printk(ap, KERN_WARNING,
                                        "device busy after hardreset\n");
@@ -563,10 +561,12 @@ static struct ata_port_operations inic_port_ops = {
 
        .irq_handler            = inic_interrupt,
        .irq_clear              = inic_irq_clear,
+       .irq_on                 = ata_irq_on,
+       .irq_ack                = ata_irq_ack,
 
        .qc_prep                = ata_qc_prep,
        .qc_issue               = inic_qc_issue,
-       .data_xfer              = ata_pio_data_xfer,
+       .data_xfer              = ata_data_xfer,
 
        .freeze                 = inic_freeze,
        .thaw                   = inic_thaw,
@@ -634,17 +634,17 @@ static int init_controller(void __iomem *mmio_base, u16 hctl)
        return 0;
 }
 
+#ifdef CONFIG_PM
 static int inic_pci_device_resume(struct pci_dev *pdev)
 {
        struct ata_host *host = dev_get_drvdata(&pdev->dev);
        struct inic_host_priv *hpriv = host->private_data;
-       void __iomem *mmio_base = host->mmio_base;
+       void __iomem *mmio_base = host->iomap[MMIO_BAR];
        int rc;
 
        ata_pci_device_do_resume(pdev);
 
        if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
-               printk("XXX\n");
                rc = init_controller(mmio_base, hpriv->cached_hctl);
                if (rc)
                        return rc;
@@ -654,6 +654,7 @@ static int inic_pci_device_resume(struct pci_dev *pdev)
 
        return 0;
 }
+#endif
 
 static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -661,7 +662,7 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct ata_port_info *pinfo = &inic_port_info;
        struct ata_probe_ent *probe_ent;
        struct inic_host_priv *hpriv;
-       void __iomem *mmio_base;
+       void __iomem * const *iomap;
        int i, rc;
 
        if (!printed_version++)
@@ -675,9 +676,10 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (rc)
                return rc;
 
-       mmio_base = pci_iomap(pdev, MMIO_BAR, 0);
-       if (!mmio_base)
-               return -ENOMEM;
+       rc = pcim_iomap_regions(pdev, 0x3f, DRV_NAME);
+       if (rc)
+               return rc;
+       iomap = pcim_iomap_table(pdev);
 
        /* Set dma_mask.  This devices doesn't support 64bit addressing. */
        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
@@ -711,28 +713,27 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        probe_ent->n_ports              = NR_PORTS;
 
        probe_ent->irq = pdev->irq;
-       probe_ent->irq_flags = SA_SHIRQ;
+       probe_ent->irq_flags = IRQF_SHARED;
 
-       probe_ent->mmio_base = mmio_base;
+       probe_ent->iomap = iomap;
 
        for (i = 0; i < NR_PORTS; i++) {
                struct ata_ioports *port = &probe_ent->port[i];
-               unsigned long port_base =
-                       (unsigned long)mmio_base + i * PORT_SIZE;
+               void __iomem *port_base = iomap[MMIO_BAR] + i * PORT_SIZE;
 
-               port->cmd_addr = pci_resource_start(pdev, 2 * i);
+               port->cmd_addr = iomap[2 * i];
                port->altstatus_addr =
-               port->ctl_addr =
-                       pci_resource_start(pdev, 2 * i + 1) | ATA_PCI_CTL_OFS;
+               port->ctl_addr = (void __iomem *)
+                       ((unsigned long)iomap[2 * i + 1] | ATA_PCI_CTL_OFS);
                port->scr_addr = port_base + PORT_SCR;
 
                ata_std_ports(port);
        }
 
        probe_ent->private_data = hpriv;
-       hpriv->cached_hctl = readw(mmio_base + HOST_CTL);
+       hpriv->cached_hctl = readw(iomap[MMIO_BAR] + HOST_CTL);
 
-       rc = init_controller(mmio_base, hpriv->cached_hctl);
+       rc = init_controller(iomap[MMIO_BAR], hpriv->cached_hctl);
        if (rc) {
                dev_printk(KERN_ERR, &pdev->dev,
                           "failed to initialize controller\n");
@@ -757,8 +758,10 @@ static const struct pci_device_id inic_pci_tbl[] = {
 static struct pci_driver inic_pci_driver = {
        .name           = DRV_NAME,
        .id_table       = inic_pci_tbl,
+#ifdef CONFIG_PM
        .suspend        = ata_pci_device_suspend,
        .resume         = inic_pci_device_resume,
+#endif
        .probe          = inic_init_one,
        .remove         = ata_pci_remove_one,
 };