libata: add @ap to ata_wait_register() and introduce ata_msleep()

Add optional @ap argument to ata_wait_register() and replace msleep()
calls with ata_msleep() which take optional @ap in addition to the
duration.  These will be used to implement EH exclusion.

This patch doesn't cause any behavior difference.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index be7726d7686d..af41c6fd1254 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -589,9 +589,9 @@ static int sil24_init_port(struct ata_port *ap)
                 sil24_clear_pmp(ap);
 
         writel(PORT_CS_INIT, port + PORT_CTRL_STAT);
-        ata_wait_register(port + PORT_CTRL_STAT,
+        ata_wait_register(ap, port + PORT_CTRL_STAT,
                           PORT_CS_INIT, PORT_CS_INIT, 10, 100);
-        tmp = ata_wait_register(port + PORT_CTRL_STAT,
+        tmp = ata_wait_register(ap, port + PORT_CTRL_STAT,
                                 PORT_CS_RDY, 0, 10, 100);
 
         if ((tmp & (PORT_CS_INIT | PORT_CS_RDY)) != PORT_CS_RDY) {
@@ -631,7 +631,7 @@ static int sil24_exec_polled_cmd(struct ata_port *ap, int pmp,
         writel((u64)paddr >> 32, port + PORT_CMD_ACTIVATE + 4);
 
         irq_mask = (PORT_IRQ_COMPLETE | PORT_IRQ_ERROR) << PORT_IRQ_RAW_SHIFT;
-        irq_stat = ata_wait_register(port + PORT_IRQ_STAT, irq_mask, 0x0,
+        irq_stat = ata_wait_register(ap, port + PORT_IRQ_STAT, irq_mask, 0x0,
                                      10, timeout_msec);
 
         writel(irq_mask, port + PORT_IRQ_STAT); /* clear IRQs */
@@ -719,9 +719,9 @@ static int sil24_hardreset(struct ata_link *link, unsigned int *class,
                                 "state, performing PORT_RST\n");
 
                 writel(PORT_CS_PORT_RST, port + PORT_CTRL_STAT);
-                msleep(10);
+                ata_msleep(ap, 10);
                 writel(PORT_CS_PORT_RST, port + PORT_CTRL_CLR);
-                ata_wait_register(port + PORT_CTRL_STAT, PORT_CS_RDY, 0,
+                ata_wait_register(ap, port + PORT_CTRL_STAT, PORT_CS_RDY, 0,
                                   10, 5000);
 
                 /* restore port configuration */
@@ -740,7 +740,7 @@ static int sil24_hardreset(struct ata_link *link, unsigned int *class,
                 tout_msec = 5000;
 
         writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT);
-        tmp = ata_wait_register(port + PORT_CTRL_STAT,
+        tmp = ata_wait_register(ap, port + PORT_CTRL_STAT,
                                 PORT_CS_DEV_RST, PORT_CS_DEV_RST, 10,
                                 tout_msec);
 
@@ -1253,7 +1253,7 @@ static void sil24_init_controller(struct ata_host *host)
                 tmp = readl(port + PORT_CTRL_STAT);
                 if (tmp & PORT_CS_PORT_RST) {
                         writel(PORT_CS_PORT_RST, port + PORT_CTRL_CLR);
-                        tmp = ata_wait_register(port + PORT_CTRL_STAT,
+                        tmp = ata_wait_register(NULL, port + PORT_CTRL_STAT,
                                                 PORT_CS_PORT_RST,
                                                 PORT_CS_PORT_RST, 10, 100);
                         if (tmp & PORT_CS_PORT_RST)