1 files changed, 35 insertions, 20 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index e30c537cce32..b1b926c55a72 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -222,7 +222,7 @@ int ata_sff_busy_sleep(struct ata_port *ap,
         timeout = ata_deadline(timer_start, tmout_pat);
         while (status != 0xff && (status & ATA_BUSY) &&
                time_before(jiffies, timeout)) {
-                msleep(50);
+                ata_msleep(ap, 50);
                 status = ata_sff_busy_wait(ap, ATA_BUSY, 3);
         }
 
@@ -234,7 +234,7 @@ int ata_sff_busy_sleep(struct ata_port *ap,
         timeout = ata_deadline(timer_start, tmout);
         while (status != 0xff && (status & ATA_BUSY) &&
                time_before(jiffies, timeout)) {
-                msleep(50);
+                ata_msleep(ap, 50);
                 status = ap->ops->sff_check_status(ap);
         }
 
@@ -360,7 +360,7 @@ static void ata_dev_select(struct ata_port *ap, unsigned int device,
 
         if (wait) {
                 if (can_sleep && ap->link.device[device].class == ATA_DEV_ATAPI)
-                        msleep(150);
+                        ata_msleep(ap, 150);
                 ata_wait_idle(ap);
         }
 }
@@ -1302,6 +1302,18 @@ fsm_start:
 }
 EXPORT_SYMBOL_GPL(ata_sff_hsm_move);
 
+void ata_sff_queue_work(struct work_struct *work)
+{
+        queue_work(ata_sff_wq, work);
+}
+EXPORT_SYMBOL_GPL(ata_sff_queue_work);
+
+void ata_sff_queue_delayed_work(struct delayed_work *dwork, unsigned long delay)
+{
+        queue_delayed_work(ata_sff_wq, dwork, delay);
+}
+EXPORT_SYMBOL_GPL(ata_sff_queue_delayed_work);
+
 void ata_sff_queue_pio_task(struct ata_link *link, unsigned long delay)
 {
         struct ata_port *ap = link->ap;
@@ -1311,8 +1323,7 @@ void ata_sff_queue_pio_task(struct ata_link *link, unsigned long delay)
         ap->sff_pio_task_link = link;
 
         /* may fail if ata_sff_flush_pio_task() in progress */
-        queue_delayed_work(ata_sff_wq, &ap->sff_pio_task,
-                           msecs_to_jiffies(delay));
+        ata_sff_queue_delayed_work(&ap->sff_pio_task, msecs_to_jiffies(delay));
 }
 EXPORT_SYMBOL_GPL(ata_sff_queue_pio_task);
 
@@ -1320,7 +1331,7 @@ void ata_sff_flush_pio_task(struct ata_port *ap)
 {
         DPRINTK("ENTER\n");
 
-        cancel_rearming_delayed_work(&ap->sff_pio_task);
+        cancel_delayed_work_sync(&ap->sff_pio_task);
         ap->hsm_task_state = HSM_ST_IDLE;
 
         if (ata_msg_ctl(ap))
@@ -1336,7 +1347,7 @@ static void ata_sff_pio_task(struct work_struct *work)
         u8 status;
         int poll_next;
 
-        BUG_ON(ap->sff_pio_task_link == NULL); 
+        BUG_ON(ap->sff_pio_task_link == NULL);
         /* qc can be NULL if timeout occurred */
         qc = ata_qc_from_tag(ap, link->active_tag);
         if (!qc) {
@@ -1356,7 +1367,7 @@ fsm_start:
          */
         status = ata_sff_busy_wait(ap, ATA_BUSY, 5);
         if (status & ATA_BUSY) {
-                msleep(2);
+                ata_msleep(ap, 2);
                 status = ata_sff_busy_wait(ap, ATA_BUSY, 10);
                 if (status & ATA_BUSY) {
                         ata_sff_queue_pio_task(link, ATA_SHORT_PAUSE);
@@ -1532,11 +1543,10 @@ static unsigned int __ata_sff_port_intr(struct ata_port *ap,
                 if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR))
                         return ata_sff_idle_irq(ap);
                 break;
-        case HSM_ST:
-        case HSM_ST_LAST:
-                break;
-        default:
+        case HSM_ST_IDLE:
                 return ata_sff_idle_irq(ap);
+        default:
+                break;
         }
 
         /* check main status, clearing INTRQ if needed */
@@ -1937,7 +1947,7 @@ int ata_sff_wait_after_reset(struct ata_link *link, unsigned int devmask,
         unsigned int dev1 = devmask & (1 << 1);
         int rc, ret = 0;
 
-        msleep(ATA_WAIT_AFTER_RESET);
+        ata_msleep(ap, ATA_WAIT_AFTER_RESET);
 
         /* always check readiness of the master device */
         rc = ata_sff_wait_ready(link, deadline);
@@ -1966,7 +1976,7 @@ int ata_sff_wait_after_reset(struct ata_link *link, unsigned int devmask,
                         lbal = ioread8(ioaddr->lbal_addr);
                         if ((nsect == 1) && (lbal == 1))
                                 break;
-                        msleep(50);     /* give drive a breather */
+                        ata_msleep(ap, 50);     /* give drive a breather */
                 }
 
                 rc = ata_sff_wait_ready(link, deadline);
@@ -2437,13 +2447,18 @@ int ata_pci_sff_activate_host(struct ata_host *host,
                 return -ENOMEM;
 
         if (!legacy_mode && pdev->irq) {
+                int i;
+
                 rc = devm_request_irq(dev, pdev->irq, irq_handler,
                                       IRQF_SHARED, drv_name, host);
                 if (rc)
                         goto out;
 
-                ata_port_desc(host->ports[0], "irq %d", pdev->irq);
-                ata_port_desc(host->ports[1], "irq %d", pdev->irq);
+                for (i = 0; i < 2; i++) {
+                        if (ata_port_is_dummy(host->ports[i]))
+                                continue;
+                        ata_port_desc(host->ports[i], "irq %d", pdev->irq);
+                }
         } else if (legacy_mode) {
                 if (!ata_port_is_dummy(host->ports[0])) {
                         rc = devm_request_irq(dev, ATA_PRIMARY_IRQ(pdev),
@@ -2829,7 +2844,7 @@ unsigned int ata_bmdma_port_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
                 bmdma_stopped = true;
 
                 if (unlikely(host_stat & ATA_DMA_ERR)) {
-                        /* error when transfering data to/from memory */
+                        /* error when transferring data to/from memory */
                         qc->err_mask |= AC_ERR_HOST_BUS;
                         ap->hsm_task_state = HSM_ST_ERR;
                 }
@@ -3022,7 +3037,7 @@ void ata_bmdma_start(struct ata_queued_cmd *qc)
          * Or maybe I'm just being paranoid.
          *
          * FIXME: The posting of this write means I/O starts are
-         * unneccessarily delayed for MMIO
+         * unnecessarily delayed for MMIO
          */
 }
 EXPORT_SYMBOL_GPL(ata_bmdma_start);
@@ -3335,14 +3350,14 @@ void ata_sff_port_init(struct ata_port *ap)
 
 int __init ata_sff_init(void)
 {
-        ata_sff_wq = alloc_workqueue("ata_sff", WQ_RESCUER, WQ_MAX_ACTIVE);
+        ata_sff_wq = alloc_workqueue("ata_sff", WQ_MEM_RECLAIM, WQ_MAX_ACTIVE);
         if (!ata_sff_wq)
                 return -ENOMEM;
 
         return 0;
 }
 
-void __exit ata_sff_exit(void)
+void ata_sff_exit(void)
 {
         destroy_workqueue(ata_sff_wq);
 }