libata: make SCR access ops per-link

Logically, SCR access ops should take @link; however, there was no
compelling reason to convert all SCR access ops when adding @link
abstraction as there's one-to-one mapping between a port and a non-PMP
link.  However, that assumption won't hold anymore with the scheduled
addition of slave link.

Make SCR access ops per-link.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index fb13b82aacba..609d147813ae 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -123,20 +123,22 @@ static int k2_sata_check_atapi_dma(struct ata_queued_cmd *qc)
         }
 }
 
-static int k2_sata_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
+static int k2_sata_scr_read(struct ata_link *link,
+                            unsigned int sc_reg, u32 *val)
 {
         if (sc_reg > SCR_CONTROL)
                 return -EINVAL;
-        *val = readl(ap->ioaddr.scr_addr + (sc_reg * 4));
+        *val = readl(link->ap->ioaddr.scr_addr + (sc_reg * 4));
         return 0;
 }
 
 
-static int k2_sata_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)
+static int k2_sata_scr_write(struct ata_link *link,
+                             unsigned int sc_reg, u32 val)
 {
         if (sc_reg > SCR_CONTROL)
                 return -EINVAL;
-        writel(val, ap->ioaddr.scr_addr + (sc_reg * 4));
+        writel(val, link->ap->ioaddr.scr_addr + (sc_reg * 4));
         return 0;
 }