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, 12 insertions, 12 deletions

diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index db529b849948..019575bb3e08 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -57,8 +57,8 @@ struct uli_priv {
 };
 
 static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
-static int uli_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);
-static int uli_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);
+static int uli_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);
+static int uli_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
 
 static const struct pci_device_id uli_pci_tbl[] = {
         { PCI_VDEVICE(AL, 0x5289), uli_5289 },
@@ -107,39 +107,39 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)
         return hpriv->scr_cfg_addr[ap->port_no] + (4 * sc_reg);
 }
 
-static u32 uli_scr_cfg_read(struct ata_port *ap, unsigned int sc_reg)
+static u32 uli_scr_cfg_read(struct ata_link *link, unsigned int sc_reg)
 {
-        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-        unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);
+        struct pci_dev *pdev = to_pci_dev(link->ap->host->dev);
+        unsigned int cfg_addr = get_scr_cfg_addr(link->ap, sc_reg);
         u32 val;
 
         pci_read_config_dword(pdev, cfg_addr, &val);
         return val;
 }
 
-static void uli_scr_cfg_write(struct ata_port *ap, unsigned int scr, u32 val)
+static void uli_scr_cfg_write(struct ata_link *link, unsigned int scr, u32 val)
 {
-        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-        unsigned int cfg_addr = get_scr_cfg_addr(ap, scr);
+        struct pci_dev *pdev = to_pci_dev(link->ap->host->dev);
+        unsigned int cfg_addr = get_scr_cfg_addr(link->ap, scr);
 
         pci_write_config_dword(pdev, cfg_addr, val);
 }
 
-static int uli_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
+static int uli_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)
 {
         if (sc_reg > SCR_CONTROL)
                 return -EINVAL;
 
-        *val = uli_scr_cfg_read(ap, sc_reg);
+        *val = uli_scr_cfg_read(link, sc_reg);
         return 0;
 }
 
-static int uli_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val)
+static int uli_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)
 {
         if (sc_reg > SCR_CONTROL) //SCR_CONTROL=2, SCR_ERROR=1, SCR_STATUS=0
                 return -EINVAL;
 
-        uli_scr_cfg_write(ap, sc_reg, val);
+        uli_scr_cfg_write(link, sc_reg, val);
         return 0;
 }